diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue
index 814808c..91c0ec5 100644
--- a/src/views/mobile/operation/index.vue
+++ b/src/views/mobile/operation/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="H5DeviceOperation">
 import { keepSearchParams } from '@/utils/keepQuery'
 import dayjs from 'dayjs'
-import { showToast, showImagePreview } from 'vant'
+import { showToast, showImagePreview, showLoadingToast, closeToast } from 'vant'
 import { getDictByCode } from '@/api/system/dict'
 import { addDeviceInstall, getDeviceInstall, uploadApi } from '@/api/mobile/operation'
 import useUserStore from '@/store/modules/user'
@@ -107,12 +107,20 @@
   if (event.target.files?.length !== 0) {
     const file = event.target.files[0]
     const fd = new FormData()
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     fd.append('file', file)
     uploadApi(fd).then(res => {
       baseInfo.value.photo.push(res.data as string)
       fileRef.value.value = ''
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
 
     // const reader = new FileReader() // 实例化FileReader
@@ -231,7 +239,7 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div class="device-info">
       <van-form ref="formRef">
@@ -291,8 +299,8 @@
   </div>
   <!-- 按钮 -->
   <div class="btn-container">
-    <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-    <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+    <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+    <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
   </div>
 </template>
 

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue
index 814808c..91c0ec5 100644
--- a/src/views/mobile/operation/index.vue
+++ b/src/views/mobile/operation/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="H5DeviceOperation">
 import { keepSearchParams } from '@/utils/keepQuery'
 import dayjs from 'dayjs'
-import { showToast, showImagePreview } from 'vant'
+import { showToast, showImagePreview, showLoadingToast, closeToast } from 'vant'
 import { getDictByCode } from '@/api/system/dict'
 import { addDeviceInstall, getDeviceInstall, uploadApi } from '@/api/mobile/operation'
 import useUserStore from '@/store/modules/user'
@@ -107,12 +107,20 @@
   if (event.target.files?.length !== 0) {
     const file = event.target.files[0]
     const fd = new FormData()
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     fd.append('file', file)
     uploadApi(fd).then(res => {
       baseInfo.value.photo.push(res.data as string)
       fileRef.value.value = ''
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
 
     // const reader = new FileReader() // 实例化FileReader
@@ -231,7 +239,7 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div class="device-info">
       <van-form ref="formRef">
@@ -291,8 +299,8 @@
   </div>
   <!-- 按钮 -->
   <div class="btn-container">
-    <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-    <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+    <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+    <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
   </div>
 </template>
 
diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue
index e341271..7ba4c81 100644
--- a/src/views/mobile/record/detail.vue
+++ b/src/views/mobile/record/detail.vue
@@ -45,7 +45,7 @@
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: imagesList.value,
+    images: imagesList.value.map((item: any) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue
index 814808c..91c0ec5 100644
--- a/src/views/mobile/operation/index.vue
+++ b/src/views/mobile/operation/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="H5DeviceOperation">
 import { keepSearchParams } from '@/utils/keepQuery'
 import dayjs from 'dayjs'
-import { showToast, showImagePreview } from 'vant'
+import { showToast, showImagePreview, showLoadingToast, closeToast } from 'vant'
 import { getDictByCode } from '@/api/system/dict'
 import { addDeviceInstall, getDeviceInstall, uploadApi } from '@/api/mobile/operation'
 import useUserStore from '@/store/modules/user'
@@ -107,12 +107,20 @@
   if (event.target.files?.length !== 0) {
     const file = event.target.files[0]
     const fd = new FormData()
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     fd.append('file', file)
     uploadApi(fd).then(res => {
       baseInfo.value.photo.push(res.data as string)
       fileRef.value.value = ''
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
 
     // const reader = new FileReader() // 实例化FileReader
@@ -231,7 +239,7 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div class="device-info">
       <van-form ref="formRef">
@@ -291,8 +299,8 @@
   </div>
   <!-- 按钮 -->
   <div class="btn-container">
-    <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-    <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+    <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+    <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
   </div>
 </template>
 
diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue
index e341271..7ba4c81 100644
--- a/src/views/mobile/record/detail.vue
+++ b/src/views/mobile/record/detail.vue
@@ -45,7 +45,7 @@
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: imagesList.value,
+    images: imagesList.value.map((item: any) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 2237efd..3db649a 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delErrorLog,
@@ -36,7 +37,10 @@
     listQuery.offset = 1
   }
   getErrorLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue
index 814808c..91c0ec5 100644
--- a/src/views/mobile/operation/index.vue
+++ b/src/views/mobile/operation/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="H5DeviceOperation">
 import { keepSearchParams } from '@/utils/keepQuery'
 import dayjs from 'dayjs'
-import { showToast, showImagePreview } from 'vant'
+import { showToast, showImagePreview, showLoadingToast, closeToast } from 'vant'
 import { getDictByCode } from '@/api/system/dict'
 import { addDeviceInstall, getDeviceInstall, uploadApi } from '@/api/mobile/operation'
 import useUserStore from '@/store/modules/user'
@@ -107,12 +107,20 @@
   if (event.target.files?.length !== 0) {
     const file = event.target.files[0]
     const fd = new FormData()
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     fd.append('file', file)
     uploadApi(fd).then(res => {
       baseInfo.value.photo.push(res.data as string)
       fileRef.value.value = ''
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
 
     // const reader = new FileReader() // 实例化FileReader
@@ -231,7 +239,7 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div class="device-info">
       <van-form ref="formRef">
@@ -291,8 +299,8 @@
   </div>
   <!-- 按钮 -->
   <div class="btn-container">
-    <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-    <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+    <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+    <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
   </div>
 </template>
 
diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue
index e341271..7ba4c81 100644
--- a/src/views/mobile/record/detail.vue
+++ b/src/views/mobile/record/detail.vue
@@ -45,7 +45,7 @@
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: imagesList.value,
+    images: imagesList.value.map((item: any) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 2237efd..3db649a 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delErrorLog,
@@ -36,7 +37,10 @@
     listQuery.offset = 1
   }
   getErrorLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index a13655d..c96694b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delLog,
@@ -56,7 +57,10 @@
     listQuery.offset = 1
   }
   getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue
index 814808c..91c0ec5 100644
--- a/src/views/mobile/operation/index.vue
+++ b/src/views/mobile/operation/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="H5DeviceOperation">
 import { keepSearchParams } from '@/utils/keepQuery'
 import dayjs from 'dayjs'
-import { showToast, showImagePreview } from 'vant'
+import { showToast, showImagePreview, showLoadingToast, closeToast } from 'vant'
 import { getDictByCode } from '@/api/system/dict'
 import { addDeviceInstall, getDeviceInstall, uploadApi } from '@/api/mobile/operation'
 import useUserStore from '@/store/modules/user'
@@ -107,12 +107,20 @@
   if (event.target.files?.length !== 0) {
     const file = event.target.files[0]
     const fd = new FormData()
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     fd.append('file', file)
     uploadApi(fd).then(res => {
       baseInfo.value.photo.push(res.data as string)
       fileRef.value.value = ''
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
 
     // const reader = new FileReader() // 实例化FileReader
@@ -231,7 +239,7 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div class="device-info">
       <van-form ref="formRef">
@@ -291,8 +299,8 @@
   </div>
   <!-- 按钮 -->
   <div class="btn-container">
-    <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-    <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+    <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+    <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
   </div>
 </template>
 
diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue
index e341271..7ba4c81 100644
--- a/src/views/mobile/record/detail.vue
+++ b/src/views/mobile/record/detail.vue
@@ -45,7 +45,7 @@
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: imagesList.value,
+    images: imagesList.value.map((item: any) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 2237efd..3db649a 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delErrorLog,
@@ -36,7 +37,10 @@
     listQuery.offset = 1
   }
   getErrorLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index a13655d..c96694b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delLog,
@@ -56,7 +57,10 @@
     listQuery.offset = 1
   }
   getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index b1cb93d..d069d7e 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -4,7 +4,7 @@
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
-
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const { proxy } = getCurrentInstance() as any
 const listQuery: IlistQuery = reactive({
   keywords: '',
@@ -53,7 +53,10 @@
     listQuery.offset = 1
   }
   getLoginLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue
index 814808c..91c0ec5 100644
--- a/src/views/mobile/operation/index.vue
+++ b/src/views/mobile/operation/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="H5DeviceOperation">
 import { keepSearchParams } from '@/utils/keepQuery'
 import dayjs from 'dayjs'
-import { showToast, showImagePreview } from 'vant'
+import { showToast, showImagePreview, showLoadingToast, closeToast } from 'vant'
 import { getDictByCode } from '@/api/system/dict'
 import { addDeviceInstall, getDeviceInstall, uploadApi } from '@/api/mobile/operation'
 import useUserStore from '@/store/modules/user'
@@ -107,12 +107,20 @@
   if (event.target.files?.length !== 0) {
     const file = event.target.files[0]
     const fd = new FormData()
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     fd.append('file', file)
     uploadApi(fd).then(res => {
       baseInfo.value.photo.push(res.data as string)
       fileRef.value.value = ''
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
 
     // const reader = new FileReader() // 实例化FileReader
@@ -231,7 +239,7 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div class="device-info">
       <van-form ref="formRef">
@@ -291,8 +299,8 @@
   </div>
   <!-- 按钮 -->
   <div class="btn-container">
-    <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-    <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+    <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+    <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
   </div>
 </template>
 
diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue
index e341271..7ba4c81 100644
--- a/src/views/mobile/record/detail.vue
+++ b/src/views/mobile/record/detail.vue
@@ -45,7 +45,7 @@
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: imagesList.value,
+    images: imagesList.value.map((item: any) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 2237efd..3db649a 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delErrorLog,
@@ -36,7 +37,10 @@
     listQuery.offset = 1
   }
   getErrorLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index a13655d..c96694b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delLog,
@@ -56,7 +57,10 @@
     listQuery.offset = 1
   }
   getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index b1cb93d..d069d7e 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -4,7 +4,7 @@
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
-
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const { proxy } = getCurrentInstance() as any
 const listQuery: IlistQuery = reactive({
   keywords: '',
@@ -53,7 +53,10 @@
     listQuery.offset = 1
   }
   getLoginLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 2062f97..c6433a7 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -6,10 +6,11 @@
 import AddUser from './userAdd.vue'
 import RoleAssignment from './roleAssignment.vue'
 import { getDeptTreeList } from '@/api/system/dept'
-import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser } from '@/api/system/user'
+import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser, updateUser } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { RSAencrypt } from '@/utils/security'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 // 逻辑代码
 interface Tree {
   name: string
@@ -55,10 +56,31 @@
 const fetchData = (flag: string) => {
   loadingTable.value = true
   select.value = ''
-  getUserList(listQuery).then((res) => {
-    list.value = res.data.rows
+  getUserList({
+    ...listQuery,
+    keywords: /^[A-Za-z]+$/.test(listQuery.keywords) ? listQuery.keywords : encrypt(listQuery.keywords)
+  }).then((res) => {
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
     total.value = res.data.total
     loadingTable.value = false
+
+    // list.value.forEach((item: any) => {
+    //   if (!isEncrypt(item.name) && !isEncrypt(item.phone) && !isEncrypt(item.email)) {
+    //     updateUser({
+    //       ...item,
+    //       name: encrypt(item.name),
+    //       phone: encrypt(item.phone),
+    //       email: encrypt(item.email)
+    //     }).then(res => {
+    //       console.log('更新成功')
+    //     })
+    //   }
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -124,6 +146,33 @@
     ElMessage.error('必须选中一项')
   }
 }
+// 批量加密
+// const index = ref(0)
+// const batchEncrypt = () => {
+//   if (total.value === 0) {
+//     ElMessage.warning('暂无用户')
+//     return
+//   }
+//   for (let i = index.value * 20; i < ((index.value + 1) * 20); i++) {
+//     getUserList({ offset: i, limit: 1 }).then(res => {
+//       if (res.data.rows.length) {
+//         const data = res.data.rows[0]
+//         if (!isEncrypt(data.name) && !isEncrypt(data.phone) && !isEncrypt(data.email)) {
+//           updateUser({
+//             ...data,
+//             name: encrypt(data.name),
+//             phone: encrypt(data.phone),
+//             email: encrypt(data.email)
+//           }).then(res => {
+//             console.log('更新成功')
+//           })
+//         }
+//       }
+//     })
+//   }
+//   index.value += 1
+
+// }
 // 删除用户
 const deleteUser = () => {
   if (select.value) {
@@ -221,10 +270,8 @@
               </div>
             </template>
             <el-scrollbar height="100%" class="user-dept-scroll">
-              <el-tree
-                v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
-                :expand-on-click-node="false" @node-click="handleNodeClick"
-              />
+              <el-tree v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+                :expand-on-click-node="false" @node-click="handleNodeClick" />
             </el-scrollbar>
           </el-card>
         </div>
@@ -237,16 +284,12 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
           <search-item>
-            <el-date-picker
-              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间"
-            />
+            <el-date-picker v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" />
           </search-item>
           <search-item>
-            <el-date-picker
-              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择结束时间"
-            />
+            <el-date-picker v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" />
           </search-item>
         </search-area>
         <!-- 表头标题 -->
@@ -254,6 +297,10 @@
           <template #btns-left>
             <!-- 操作 -->
             <div>
+              <!-- v-if="proxy.hasPerm('/sys/mgr/batch')" -->
+              <!-- <el-button type="primary" @click="batchEncrypt">
+                批量加密
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/sys/mgr/add')" type="primary" :icon="Plus" @click="add">
                 新增
               </el-button>
@@ -266,19 +313,15 @@
               <el-button v-if="proxy.hasPerm('/sys/mgr/reset')" type="primary" :icon="Key" @click="resetPwd">
                 重置密码
               </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
-                @click="assignmentRole"
-              >
+              <el-button v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
+                @click="assignmentRole">
                 角色分配
               </el-button>
             </div>
           </template>
           <!-- 查询结果Table显示 -->
-          <normal-table
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loadingTable" @change="changePage"
-          >
+          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+            @change="changePage">
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
@@ -301,7 +344,8 @@
               </el-table-column>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button :type="(btnStatus as any)[scope.row.statusName]" link size="small" @click="frozenUser(scope.row)">
+                  <el-button :type="(btnStatus as any)[scope.row.statusName]" link size="small"
+                    @click="frozenUser(scope.row)">
                     {{ (btnNames as any)[scope.row.statusName] }}
                   </el-button>
                 </template>

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue
index 814808c..91c0ec5 100644
--- a/src/views/mobile/operation/index.vue
+++ b/src/views/mobile/operation/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="H5DeviceOperation">
 import { keepSearchParams } from '@/utils/keepQuery'
 import dayjs from 'dayjs'
-import { showToast, showImagePreview } from 'vant'
+import { showToast, showImagePreview, showLoadingToast, closeToast } from 'vant'
 import { getDictByCode } from '@/api/system/dict'
 import { addDeviceInstall, getDeviceInstall, uploadApi } from '@/api/mobile/operation'
 import useUserStore from '@/store/modules/user'
@@ -107,12 +107,20 @@
   if (event.target.files?.length !== 0) {
     const file = event.target.files[0]
     const fd = new FormData()
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     fd.append('file', file)
     uploadApi(fd).then(res => {
       baseInfo.value.photo.push(res.data as string)
       fileRef.value.value = ''
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
 
     // const reader = new FileReader() // 实例化FileReader
@@ -231,7 +239,7 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div class="device-info">
       <van-form ref="formRef">
@@ -291,8 +299,8 @@
   </div>
   <!-- 按钮 -->
   <div class="btn-container">
-    <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-    <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+    <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+    <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
   </div>
 </template>
 
diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue
index e341271..7ba4c81 100644
--- a/src/views/mobile/record/detail.vue
+++ b/src/views/mobile/record/detail.vue
@@ -45,7 +45,7 @@
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: imagesList.value,
+    images: imagesList.value.map((item: any) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 2237efd..3db649a 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delErrorLog,
@@ -36,7 +37,10 @@
     listQuery.offset = 1
   }
   getErrorLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index a13655d..c96694b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delLog,
@@ -56,7 +57,10 @@
     listQuery.offset = 1
   }
   getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index b1cb93d..d069d7e 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -4,7 +4,7 @@
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
-
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const { proxy } = getCurrentInstance() as any
 const listQuery: IlistQuery = reactive({
   keywords: '',
@@ -53,7 +53,10 @@
     listQuery.offset = 1
   }
   getLoginLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 2062f97..c6433a7 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -6,10 +6,11 @@
 import AddUser from './userAdd.vue'
 import RoleAssignment from './roleAssignment.vue'
 import { getDeptTreeList } from '@/api/system/dept'
-import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser } from '@/api/system/user'
+import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser, updateUser } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { RSAencrypt } from '@/utils/security'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 // 逻辑代码
 interface Tree {
   name: string
@@ -55,10 +56,31 @@
 const fetchData = (flag: string) => {
   loadingTable.value = true
   select.value = ''
-  getUserList(listQuery).then((res) => {
-    list.value = res.data.rows
+  getUserList({
+    ...listQuery,
+    keywords: /^[A-Za-z]+$/.test(listQuery.keywords) ? listQuery.keywords : encrypt(listQuery.keywords)
+  }).then((res) => {
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
     total.value = res.data.total
     loadingTable.value = false
+
+    // list.value.forEach((item: any) => {
+    //   if (!isEncrypt(item.name) && !isEncrypt(item.phone) && !isEncrypt(item.email)) {
+    //     updateUser({
+    //       ...item,
+    //       name: encrypt(item.name),
+    //       phone: encrypt(item.phone),
+    //       email: encrypt(item.email)
+    //     }).then(res => {
+    //       console.log('更新成功')
+    //     })
+    //   }
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -124,6 +146,33 @@
     ElMessage.error('必须选中一项')
   }
 }
+// 批量加密
+// const index = ref(0)
+// const batchEncrypt = () => {
+//   if (total.value === 0) {
+//     ElMessage.warning('暂无用户')
+//     return
+//   }
+//   for (let i = index.value * 20; i < ((index.value + 1) * 20); i++) {
+//     getUserList({ offset: i, limit: 1 }).then(res => {
+//       if (res.data.rows.length) {
+//         const data = res.data.rows[0]
+//         if (!isEncrypt(data.name) && !isEncrypt(data.phone) && !isEncrypt(data.email)) {
+//           updateUser({
+//             ...data,
+//             name: encrypt(data.name),
+//             phone: encrypt(data.phone),
+//             email: encrypt(data.email)
+//           }).then(res => {
+//             console.log('更新成功')
+//           })
+//         }
+//       }
+//     })
+//   }
+//   index.value += 1
+
+// }
 // 删除用户
 const deleteUser = () => {
   if (select.value) {
@@ -221,10 +270,8 @@
               </div>
             </template>
             <el-scrollbar height="100%" class="user-dept-scroll">
-              <el-tree
-                v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
-                :expand-on-click-node="false" @node-click="handleNodeClick"
-              />
+              <el-tree v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+                :expand-on-click-node="false" @node-click="handleNodeClick" />
             </el-scrollbar>
           </el-card>
         </div>
@@ -237,16 +284,12 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
           <search-item>
-            <el-date-picker
-              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间"
-            />
+            <el-date-picker v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" />
           </search-item>
           <search-item>
-            <el-date-picker
-              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择结束时间"
-            />
+            <el-date-picker v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" />
           </search-item>
         </search-area>
         <!-- 表头标题 -->
@@ -254,6 +297,10 @@
           <template #btns-left>
             <!-- 操作 -->
             <div>
+              <!-- v-if="proxy.hasPerm('/sys/mgr/batch')" -->
+              <!-- <el-button type="primary" @click="batchEncrypt">
+                批量加密
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/sys/mgr/add')" type="primary" :icon="Plus" @click="add">
                 新增
               </el-button>
@@ -266,19 +313,15 @@
               <el-button v-if="proxy.hasPerm('/sys/mgr/reset')" type="primary" :icon="Key" @click="resetPwd">
                 重置密码
               </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
-                @click="assignmentRole"
-              >
+              <el-button v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
+                @click="assignmentRole">
                 角色分配
               </el-button>
             </div>
           </template>
           <!-- 查询结果Table显示 -->
-          <normal-table
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loadingTable" @change="changePage"
-          >
+          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+            @change="changePage">
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
@@ -301,7 +344,8 @@
               </el-table-column>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button :type="(btnStatus as any)[scope.row.statusName]" link size="small" @click="frozenUser(scope.row)">
+                  <el-button :type="(btnStatus as any)[scope.row.statusName]" link size="small"
+                    @click="frozenUser(scope.row)">
                     {{ (btnNames as any)[scope.row.statusName] }}
                   </el-button>
                 </template>
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index a25c989..927d103 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -10,6 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { RSAencrypt } from '@/utils/security'
+import { encrypt , decrypt } from '@/utils/security1'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
 const dialogFormVisible = ref<boolean>(false)// 对话框是否显示
@@ -118,7 +119,12 @@
     userForm1.rePassword = await RSAencrypt(userForm1.rePassword)
     if (valid) {
       btnLoading.value = true
-      addUser(userForm1).then((response) => {
+      addUser({
+        ...userForm1,
+        name: encrypt(userForm1.name),
+        email: encrypt(userForm1.email),
+        phone: encrypt(userForm1.phone),
+      }).then((response) => {
         ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
           confirmButtonText: '是',
           cancelButtonText: '否',
@@ -144,7 +150,13 @@
   ruleFormRef.value?.validate((valid) => {
     if (valid) {
       btnLoading.value = true
-      updateUser(userForm).then((response) => {
+      updateUser({
+        ...userForm,
+        // account: encrypt(userForm.account),
+        name: encrypt(userForm.name),
+        email: encrypt(userForm.email),
+        phone: encrypt(userForm.phone),
+      }).then((response) => {
         ElMessage.success('修改成功')
         dialogFormVisible.value = false
         emits('resetData')

diff --git a/index.html b/index.html
index ab3d4a5..4201406 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
           <div class="square"></div>
           <div class="square"></div>
         </div>
-        <div class="text"><%= title %>载入中…</div>
+        <div id="loading-text" class="text"><%= title %>载入中…</div>
       </div>
       <div id="browser-upgrade">
         <div class="title">为了您的体验，推荐使用以下浏览器</div>
@@ -39,4 +39,14 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
+  <script>
+    // 感知数据汇聚平台
+    // 北燃施工管理助手
+    // 修改页面标题 和 加载提示标题
+    document.title = window.localStorage.getItem('project-name') || '<%= title %>'
+    const loading = document.getElementById('loading-text')
+    if(loading) {
+      loading.innerText  = `${window.localStorage.getItem('project-name') || '<%= title %>'}载入中...`
+    }
+  </script>
 </html>
diff --git a/public/config/config.json b/public/config/config.json
index c21f0e1..d60ba89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
-  "title":"燃气物联感知平台",
-  "baseUrl": "http://192.168.228.39:8083",
+  "title":"感知数据汇聚平台",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/App.vue b/src/App.vue
index 4076bc2..3b3c411 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,10 +71,10 @@
 ], () => {
   if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
     const title = settingsStore.title
-    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    document.title = `${title} - ${window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE}`
   }
   else {
-    document.title = import.meta.env.VITE_APP_TITLE
+    document.title = window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE
   }
 }, {
   immediate: true,
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index 3ef12ec..58dc6ad 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -4,8 +4,11 @@
 // 获取设备id
 export const getDeviceID = (deviceCode: any) => {
   return request({
-    url: `/ptz/getOneDevice/${deviceCode}`,
+    url: `/ptz/getOneDevice`,
     method: 'post',
+    data: {
+      devcode: deviceCode
+    }
   })
 }
 
diff --git a/src/api/home/well/well.ts b/src/api/home/well/well.ts
index 56fa626..ae43a8b 100644
--- a/src/api/home/well/well.ts
+++ b/src/api/home/well/well.ts
@@ -28,6 +28,15 @@
     data,
   })
 }
+// 获取闸井下的设备类型
+
+export function getTypeListByWellId(data: any) {
+  return request({
+    url: '/system/busLedger/getTypeListByWellId',
+    method: 'post',
+    data,
+  })
+}
 
 // 全生命周期记录
 export function getLifecycleRecord(data: any) {
diff --git a/src/api/mobile/device.ts b/src/api/mobile/device.ts
new file mode 100644
index 0000000..06b093e
--- /dev/null
+++ b/src/api/mobile/device.ts
@@ -0,0 +1,21 @@
+/**
+ * 新装设备
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function addDevice(data: any) {
+  return request({
+    url: `/system/busDevice/add`,
+    method: 'post',
+    data,
+  })
+}
+
+export function editDevice(data: any) {
+  return request({
+    url: `/system/busDevice/edit`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9b3c169..2da5e12 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -5,6 +5,9 @@
   return request({
     url: `${prefix}user/login`,
     method: 'post',
+    params: {
+      kaptcha: data.kaptcha
+    },
     headers: {
       sid: data.sid,
     },
@@ -36,8 +39,8 @@
 }
 
 // 获取验证码图片
-export function getKaptcha() {
-  return request.get(`${prefix}kaptcha/base64`)
+export function getKaptcha(sid: string) {
+  return request.get(`${prefix}kaptcha/base64?sid=${sid}`)
 }
 // 用特定字符换取token
 export function getAdminToken(code: string) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 2725c30..9ecab5e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -87,6 +87,8 @@
     VanPicker: typeof import('vant/es')['Picker']
     VanPickerGroup: typeof import('vant/es')['PickerGroup']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index e8c31b0..6387a43 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -47,6 +47,7 @@
         resultFun(position)
       }
       else {
+
         position = ''
         resultFun(position)
       }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 21f93d6..70f44d9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -43,6 +43,7 @@
     var geocoder = new AMap.value.Geocoder()
     var lnglat = location
     geocoder.getAddress(lnglat, (status: any, result: any) => {
+      console.log(status, result)
       if (status === 'complete' && result.info === 'OK') {
         // result为对应的地理位置详细信息
         // console.log(result.regeocode.formattedAddress)
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..6a9e3dc 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -15,7 +15,7 @@
 
 const settingsStore = useSettingsStore()
 
-const title = ref(import.meta.env.VITE_APP_TITLE)
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
 const to = computed(() => {
diff --git a/src/main.ts b/src/main.ts
index 8a420e8..59a469c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -52,17 +52,20 @@
   window.localStorage.setItem('JsKey', result.data.JsKey)
   window.localStorage.setItem('areaCode', JSON.stringify(result.data.areaCode))
   window.localStorage.setItem('xuntengMap', result.data.xuntengMap)
-  axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
-    console.log('请求通了')
-    window.sessionStorage.setItem('ping-xunteng-layer', '1')
-  }).catch((error) => {
-    console.log('请求不通')
-    window.sessionStorage.setItem('ping-xunteng-layer', '')
-    if (error.message) {
-      console.log('网络异常')
+  window.localStorage.setItem('project-name', result.data.title)
+  if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+    axios.get(`${window.localStorage.getItem('xuntengMap') as string}/L16/R00006105/C0000d2ba.png?ts=${new Date().getTime()}`).then(() => {
+      console.log('请求通了')
+      window.sessionStorage.setItem('ping-xunteng-layer', '1')
+    }).catch((error) => {
+      console.log('请求不通')
       window.sessionStorage.setItem('ping-xunteng-layer', '')
-    }
-  })
+      if (error.message) {
+        console.log('网络异常')
+        window.sessionStorage.setItem('ping-xunteng-layer', '')
+      }
+    })
+  }
   request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
   app.config.globalProperties.config = result.data
   app.config.globalProperties.hasPerm = hasPermission
@@ -101,7 +104,7 @@
   }
   app.config.globalProperties.pauseAudio = () => {
     const audio = document.getElementById('eventAudio') as HTMLAudioElement
-    if(audio) {
+    if (audio) {
       audio.pause()
     }
 
@@ -132,3 +135,4 @@
 }).catch((error) => {
   console.error(`get baseConfig error...${error}`)
 })
+
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 17f7f9c..55c8710 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -50,6 +50,18 @@
           auth: '/mobile/device',
         },
       },
+      {
+        path: 'success',
+        component: () => import('@/views/mobile/device/success.vue'),
+        name: 'DeviceAddSuccess',
+        meta: {
+          title: '新装设备',
+          isHeader: true, // 是否需要头部
+          isBack: true, // 是否需要返回按钮
+          isHome: false, // 是否需要回到首页按钮
+          auth: '/mobile/device',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 4577ab4..95be661 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -195,7 +195,7 @@
           auth: '/sys/log/error/list',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/system/error',
+          activeMenu: '/system/errorLog',
         },
       },
       {
diff --git a/src/router/routes.ts b/src/router/routes.ts
index b55ec3f..a18912c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,7 +5,8 @@
 import mobileRoute from './modules/mobile'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'
-
+import config from '/public/config/config.json'
+// console.log(config)
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
   {
@@ -32,10 +33,11 @@
     },
   },
 ]
-const userAgent = navigator.userAgent || navigator.vendor || window.opera
-const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// const userAgent = navigator.userAgent || navigator.vendor || window.opera
+// const isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent)
+// window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
+const isMobile = config.mode === 'mobile'
 window.localStorage.setItem('browser-type-bj-well', `${isMobile ? 'mobile' : 'pc'}`)
-console.log(window.localStorage.getItem('browser-type-bj-well'), '路由中获取浏览器类型')
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b6dc16b..bc66403 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@
 import type { Menu } from '@/global'
 import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 import indexDB from '@/utils/indexDB'
+import { decrypt, isEncrypt } from '@/utils/security1'
 import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData'
 const useUserStore = defineStore(
   // 唯一ID
@@ -148,9 +149,8 @@
             }
             this.id = res.data.id
             this.username = res.data.account
-            this.name = res.data.name
+            this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
             resolve(res.data)
-            console.log(indexDB.getStatus(), window.localStorage.getItem('browser-type-bj-well'), 'indexDB加载状态')
             if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
               // 重新拉取缓存
               fetchCacheDevice()
diff --git a/src/utils/getLocation.ts b/src/utils/getLocation.ts
index 145e800..e046f94 100644
--- a/src/utils/getLocation.ts
+++ b/src/utils/getLocation.ts
@@ -35,11 +35,7 @@
     function successCallback(position: any) {
       var latitude = position.coords.latitude
       var longitude = position.coords.longitude
-      // console.log(`Latitude11: ${latitude}`)
-      // console.log(`Longitude11: ${longitude}`)
       const data = wgs84togcj02(Number(position.coords.longitude), Number(position.coords.latitude))
-      // console.log(`latitude: ${data[1]}`)
-      // console.log(`longitude: ${data[0]}`)
       sessionStorage.setItem('latitude', data[1])
       sessionStorage.setItem('longitude', data[0])
     }
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 160b4b0..1b55cfb 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -50,3 +50,5 @@
   }
   return enRes
 }
+
+
diff --git a/src/utils/security1.ts b/src/utils/security1.ts
new file mode 100644
index 0000000..f367d7e
--- /dev/null
+++ b/src/utils/security1.ts
@@ -0,0 +1,46 @@
+const encodedString = 'encrypt'.charCodeAt(0) - 3
+// 简易加密
+export function encrypt(str) {
+  if (!str) {
+    return ''
+  }
+  let encryptedStr = '';
+  // 遍历每个字符并进行加密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并加上常量 10
+    let encryptedCharCode = str.charCodeAt(i) + 10;
+    // 将加密后的字符拼接起来
+    encryptedStr += String.fromCharCode(encryptedCharCode);
+  }
+  // 返回加密后的字符串
+  return `${encryptedStr},${encodedString}`;
+}
+// 判断是否加密
+export function isEncrypt(str) {
+  if (str.includes(`,${encodedString}`)) {
+    return true
+  }
+  else {
+    return false
+  }
+}
+export function decrypt(str) {
+  if (!str) {
+    return ''
+  }
+  if (!isEncrypt(str)) {
+    return str
+  }
+  let decryptedNum = '';
+  str = str.split(`,${encodedString}`)[0]
+  // 遍历每个字符并进行解密
+  for (let i = 0; i < str.length; i++) {
+    // 将字符转换为 ASCII 码并减去常量 10
+    let decryptedCharCode = str.charCodeAt(i) - 10;
+    // 将解密后的 ASCII 码转换为数字并拼接起来
+    decryptedNum += String.fromCharCode(decryptedCharCode);
+  }
+  // 将字符串转换为数字并返回
+  return decryptedNum
+  // return parseInt(decryptedNum);
+}
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index 5f26866..feec9fc 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -220,4 +220,47 @@
   return res;
 }
 
+// 根据子元素的id找出所有父元素(树形结构数据)
+export const findParentPids = (tree: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
 
+  const traverse = (node: TreeNode, parentPid?: string): boolean => {
+    if (node.id === targetId) {
+      if (parentPid) {
+        parentPids.push(parentPid);
+      }
+      return true;
+    }
+
+    if (node.children) {
+      for (const child of node.children) {
+        if (traverse(child, node.id)) {
+          if (parentPid) {
+            parentPids.push(parentPid);
+          }
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  for (const node of tree) {
+    traverse(node);
+  }
+
+  return parentPids;
+}
+// 根据子元素的id找出所有父元素(平面数据数据)
+export const findParentPids1 = (flatData: TreeNode[], targetId: string): string[] => {
+  const parentPids: string[] = [];
+  let currentNode = flatData.find(node => node.id === targetId);
+
+  while (currentNode && currentNode.pid !== '0') {
+    parentPids.push(currentNode.pid);
+    currentNode = flatData.find(node => node.id === currentNode.pid);
+  }
+
+  return parentPids;
+};
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 3dab5a7..814a1ee 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -16,6 +16,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import gasDataDialog from './gasDataDialog.vue'
 import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -103,6 +104,9 @@
     align: '',
   },
 ])
+if($route.query.type === 'history') {
+  descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
+}
 // 报警动态
 const alarmDynamics = ref<any[]>([])
 const showDeviceTips = ref(false) // 展示设备编号提示
@@ -160,6 +164,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -252,6 +260,7 @@
     gasRef.value.initDialog(detailInfo.value, timerange)
   }
 }
+
 onMounted(() => {
   fetchDetail()
 })
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 4ba55f7..42c12be 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -218,19 +218,22 @@
     style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
     style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
   }
-  if (name.includes('未读')) {
+  if(!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
     handlerStyle('#f56c6c')
   }
-  else if (name.includes('已读')) {
+  else if (name?.includes('已读')) {
     handlerStyle('#0D76D4')
   }
-  else if (name.includes('待现场确认') || name.includes('待处置')) {
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
     handlerStyle('#F7C948')
   }
-  else if (name.includes('挂起')) {
+  else if (name?.includes('挂起')) {
     handlerStyle('#F58800')
   }
-  else if (name.includes('已处置') || name.includes('已确认')) {
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
     handlerStyle('#67c23a')
   }
   return style
@@ -357,7 +360,8 @@
           {{ info.processStatusName }}
         </span>
       </div>
-      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item">
+      <!--  -->
+      <div v-if="type === 'data' && info.processStatusName !== '已读' && Number(info.processStatus) > 4"  class="item">
         现场确认情况:
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index d8523d6..40abb2c 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -185,15 +185,15 @@
         } as { [key: string]: string }
         list.value = list.value.map((item: any) => ({
           ...item,
-          pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-          pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-          leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-          leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-          rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-          rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+          pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+          pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+          leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+          leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+          rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+          rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -256,7 +256,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.snr || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.snr || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -291,7 +291,7 @@
         data.value = [
           {
             name: '燃气浓度',
-            data: list.value.slice().reverse().map(item => item.gasval || '0'),
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
             symbol: list.value.length > 1 ? 'none' : 'circle',
             markLine: {
               data: markLineData,
@@ -332,18 +332,18 @@
         data.value = [
           {
             name: '左侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.leftGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
           },
           {
             name: '右侧甲烷值',
-            data: list.value.slice().reverse().map(item => item.rightGas || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
           }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
           {
             name: '浓度',
-            data: list.value.slice().reverse().map(item => item.concentration || '0')
+            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0')
           }
         ]
       }
@@ -452,9 +452,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${info.value.devTypeName}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 666fe82..f2611a7 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
       const indexDict = {
         1: '一',
         2: '二',
@@ -131,7 +131,7 @@
       data.value = [
         {
           name: '燃气浓度',
-          data: list.value.map((item: any) => item.strength).reverse(),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.strength).reverse(),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -205,9 +205,9 @@
   exportExcel({
     json: list.value.map((item: any, index: number) => ({ '1index': index + 1,
     '2strength': item.strength, '3pci': item.pci,
-    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, '7status': item.status })),
+    '4cell': item.cell, '5uptime': item.uptime,'6logtime': item.logtime, })),
     name: '浓度数据',
-    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '燃气浓度（%LEL)', '信号强度', '电池电压(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 01cd2bb..253672c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="MonitorDataDialog">
 import { alarmProcessNode } from '@/api/home/alarm/current'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const dialogFormVisible = ref(false) // 对话框是否显示
 const initData = [
@@ -95,6 +96,12 @@
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
+      res.data =res.data.map((item:any) => ({
+        ...item,
+        APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
+        NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
+      }))
+      console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -114,21 +121,21 @@
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
         <span>时间: ${already[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${already[0].NAME}</span></br>
+        <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
         <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${confirm[0].NAME}</span></br>
+        <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
-        <span>人员: ${pending[0].NAME}</span></br>
+        <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
@@ -141,12 +148,12 @@
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            console.log(1111)
-            console.log(processData.value[cindex].procrssNames)
+            // console.log(1111)
+            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容: ${data[index].DESCN}</span></br>
         `
@@ -154,12 +161,12 @@
             else {
               processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
 
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         })
         processData.value[0].content = `
@@ -174,10 +181,10 @@
             const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
             processData.value[cindex].content = `
                     <span>时间: ${data[index].APPROVAL_TIME}</span></br>
-        <span>人员: ${data[index].NAME}</span></br>
+        <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
-            processData.value[cindex].person = data[index].NAME
+            processData.value[cindex].person = data[index].NAME || data[index].APPROVAL_PERSON
           }
         }
         active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index cff2a4d..a79a16e 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -9,6 +9,7 @@
 import { remindAlarm } from '@/api/home/alarm/current'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const emits = defineEmits(['refresh'])
 const user = useUserStore()
 const dataFormRef = ref()
@@ -102,7 +103,13 @@
 const userList = ref<any[]>([]) // 用户列表
 const fetchDict = () => {
   getUserList({ offset: 1, limit: 9999, deptId: user.deptId }).then((res) => {
-    userList.value = res.data.rows.map((item: any) => ({
+    userList.value = res.data.rows.map((item:any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
+    .map((item: any) => ({
       label: `${item.name}(${item.deptName})`,
       value: item.id,
       id: item.id,
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index ba700c3..443bc8d 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -46,10 +46,10 @@
   { text: '位置', value: 'position', align: 'center' },
   { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
+  // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '解除时间', value: 'cancelTime', align: 'center' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 612d68d..9cdb8e8 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -133,14 +133,16 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '时间', value: 'logtime', align: 'center' },
 ])
 const manufactureName = ref('')
+const typeName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
-  console.log(row, 'row')
+  // console.log(row, 'row')
+  typeName.value = deviceTypeName
   if (deviceTypeName) {
     if (deviceTypeName.includes('燃气智能监测终端')) {
       columns.value = columns1.value
@@ -197,6 +199,10 @@
     devTypeId: deviceTypeList.value.filter((item: any) => item.typeName === listQuery.value.typeName)[0]?.id || ''
   })
   handlerthreshold.value = res.data
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   // 判断阈值
   const handlerthresholdFun = (value: string, threshold: string[]) => {
     if (!threshold) {
@@ -274,15 +280,16 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
-    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
     if (!listQuery.value.typeName || listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item: any) => ({
         ...item,
@@ -292,7 +299,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => item.strength || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.strength || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -314,7 +321,7 @@
       chartData.value = [
         {
           name: '燃气浓度',
-          data: list.value.slice().reverse().map(item => Number(item.gasval) || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => Number(item.gasval) || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -349,12 +356,12 @@
       chartData.value = [
         {
           name: '左侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
         {
           name: '右侧甲烷值',
-          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -363,7 +370,7 @@
       chartData.value = [
         {
           name: '浓度',
-          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.concentration || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
         },
       ]
@@ -406,6 +413,10 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (typeName.value.includes('云台')) {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+  }
   exportDeviceData(listQuery.value).then((res) => {
     exportFile(res.data, '设备数据查询列表.xlsx')
     loading.close()
@@ -413,6 +424,9 @@
     loading.close()
   })
 }
+defineExpose({
+  typeName
+})
 </script>
 
 <template>
@@ -420,12 +434,12 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <div style="display: flex;align-items: center;">
-        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
-        <el-date-picker v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        <span v-if="!typeName.includes('云台')" style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker v-if="!typeName.includes('云台')" v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
           end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
-        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-model="timerangForReport" type="datetimerange" range-separator="至" :start-placeholder="!typeName.includes('云台') ? '上报开始时间' : '开始时间'"
+          :end-placeholder="!typeName.includes('云台') ? '上报结束时间' : '结束时间'" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
diff --git a/src/views/home/device/device/components/detailData.vue b/src/views/home/device/device/components/detailData.vue
index 2979f34..a03098e 100644
--- a/src/views/home/device/device/components/detailData.vue
+++ b/src/views/home/device/device/components/detailData.vue
@@ -16,12 +16,21 @@
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
+const typeName = ref('')
+const dataRef = ref()
+watch(() => dataRef.value?.typeName, (newVal) => {
+   if(newVal) {
+    typeName.value = newVal
+   }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="数据查询" name="数据查询">
-      <data-search v-if="activeName === '数据查询'" />
+      <data-search ref="dataRef" v-if="activeName === '数据查询'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="状态上报" name="状态上报">
       <status-report v-if="activeName === '状态上报'" />
@@ -35,7 +44,7 @@
     <el-tab-pane label="控制记录" name="控制记录">
       <control-record v-if="activeName === '控制记录'" />
     </el-tab-pane>
-    <el-tab-pane label="耗电分析" name="耗电分析">
+    <el-tab-pane v-if="!typeName.includes('云台')" label="耗电分析" name="耗电分析">
       <electricity-analyse v-if="activeName === '耗电分析'" />
     </el-tab-pane>
     <!-- <el-tab-pane label="离线分析" name="离线分析">
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index 4199986..133ad6a 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -49,12 +49,12 @@
     list.value = res.data
     loadingTable.value = false
 
-    xAxisData.value = list.value.map((item: any) => item.uptime).reverse()
+    xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
     data.value = [
       {
         name: '电量',
         // data: ['100', '87', '73', '53', '41', '32', '17'],
-        data: list.value.map((item: any) => item.cell).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.cell).reverse(),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index fe57d1e..3c7c340 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -13,6 +13,7 @@
 import { shortcuts } from '@/utils/common'
 import { instructionProductList } from './components/instruction'
 import { uniqueMultiArray } from '@/utils/Array'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -77,6 +78,7 @@
       framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
       instructionTypeCustrom: typeInstruction(item.productId), // 产品
       showDeviceTips: false, // 展示设备编号提示
+      operatorName: isEncrypt(item.operatorName) ? decrypt(item.operatorName) : item.operatorName,
     }))
     // 设备类型和厂商
     list.value.forEach((item: any) => {
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 9c35a75..5428d22 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -13,6 +13,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -94,16 +95,16 @@
   //   value: 'realAlarmName',
   //   align: 'center',
   // },
-  {
-    text: '解除时长',
-    value: 'cancelDuration',
-    align: 'center',
-  },
-  {
-    text: '处置时长',
-    value: 'processDuration',
-    align: 'center',
-  },
+  // {
+  //   text: '解除时长',
+  //   value: 'cancelDuration',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '处置时长',
+  //   value: 'processDuration',
+  //   align: 'center',
+  // },
   // {
   //   text: '',
   //   value: '',
@@ -126,8 +127,9 @@
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
-    detailInfo.value.address = `${detailInfo.value.ledgerCode} ${detailInfo.value.ledgerCode ? '|' : ''}${res.data.ledgerName}`
-    console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
+    // console.log(detailInfo.value, 'detailInfo.value')
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -144,6 +146,12 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    // approvalPerson
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
+    // console.log(alarmDynamics.value, 'alarmDynamics.value')
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 5f0d898..fc0820f 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -90,7 +90,7 @@
 // 关闭信息窗体
 const closeInfoDetail = () => {
   if (detail.value) {
-    detail.value.close()
+    detail.value?.close()
   }
 }
 const refresh = () => {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index a34a05f..f13eaf9 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -266,9 +266,15 @@
       draw()
     }
     else {
-      setTimeout(() => {
-        draw()
-      }, 1000)
+      const timer = setInterval(() => {
+        if(mapRef.value.completeFlag) {
+          draw()
+          clearInterval(timer)
+        }
+      }, 500);
+      // setTimeout(() => {
+      //   draw()
+      // }, 1000)
     }
   })
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 18a5966..3e2f85c 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDateDiff } from '@/utils/dayjs'
 import showPosition from '@/views/home/device/device/components/showPosition.vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -145,6 +146,10 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
+    alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
+      ...item,
+      approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
+    }))
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 41763e8..fb28efe 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -32,7 +32,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
   { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
+  // { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 896a317..5c7d2fe 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { shortcuts } from '@/utils/common'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -25,7 +26,7 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
-  { text: '维护时间', value: 'finishTime', align: 'center', width: '200' },
+  { text: '维护时间', value: 'repairTime', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -67,6 +68,7 @@
       ...item,
       deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0]?.typeName || '',
       repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0]?.name || '',
+      repairPerson: isEncrypt(item.repairPerson) ? decrypt(item.repairPerson) : item.repairPerson,
     }))
     total.value = res.data.total
     loadingTable.value = false
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index aa2bb3a..96f3e6b 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -123,7 +123,13 @@
 // 初始化对话框
 const initDialog = (row: any) => {
   locationArr.value = []
-  datetimerange.value = datetimerange.value = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  if(row.createTime) {
+    datetimerange.value  = [`${dayjs(row.createTime).format('YYYY-MM-DD')} 00:00:00`, dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')]
+  }
+  else {
+    datetimerange.value  = []
+  }
+  // datetimerange.value  = [dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   info.value = row
   dialogFormVisible.value = true
   setTimeout(() => {
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2ded69b..b277b1c 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,15 +209,31 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
-    if(listQuery.value.typeName.includes('燃气智能监测终端')) {
-      list.value = list.value.map((item:any) => ({
+    list.value = res.data.map((item: any) => toHumpObject(item))
+    if (listQuery.value.typeName.includes('燃气智能监测终端')) {
+      list.value = list.value.map((item: any) => ({
         ...item,
         rsrpName: item.rsrp ? handlerSignalStrength(Number(item.rsrp)) : ''
       }))
     }
+    else if (listQuery.value.typeName.includes('智能警示桩')) {
+      const dict = {
+        0: '正常',
+        1: '报警'
+      } as { [key: string]: string }
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
+      }))
+    }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      // JSON.parse(JSON.stringify(list.value)).slice().reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +295,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +316,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +329,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +398,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -409,7 +425,8 @@
           <el-button v-if="listQuery.typeName?.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
             切换视图
           </el-button>
-          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+          <el-button v-if="listQuery.typeName?.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+            @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index a9d3100..0b27eb8 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[String(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[String(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[String(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[String(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[String(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
@@ -376,7 +376,7 @@
         <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
           搜索
         </el-button>
-        <el-button style="margin-left: 10px" @click="switchView">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
         <!-- <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 9d622d7..f37822d 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -145,6 +145,7 @@
 // 字典
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const alarmTypeAllList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const alarmEventList = ref<{ id: string; name: string; value: string }[]>([]) // 报警事件
 const alarmNoteMethodList = ref<{ id: string; name: string; value: string }[]>([
@@ -188,7 +189,8 @@
       value: item.id,
       id: item.id,
     })), 'name')
-    console.log(alarmTypeList.value, 'alarmTypeList.value')
+    alarmTypeAllList.value = JSON.parse(JSON.stringify(alarmTypeList.value))
+    // console.log(alarmTypeList.value, 'alarmTypeList.value')
   })
   // 产品
   getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
@@ -234,7 +236,20 @@
     }
     if (!isFisrst.value) {
       dataForm.value.alarmThreshold = ''
+
+      dataForm.value.alarmTypeId = ''
     }
+
+    //  0 设备  1 系统
+    if (newVal === '0') {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => item.name?.includes('设备'))
+    }
+    else {
+      alarmTypeList.value = alarmTypeAllList.value.filter(item => !item.name?.includes('设备'))
+    }
+  }
+  else {
+    alarmTypeList.value = alarmTypeAllList.value
   }
 }, {
   deep: true,
@@ -244,7 +259,7 @@
 watch(() => dataForm.value.productId, (newVal) => {
   if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
-    console.log(currentProduct.value, 'currentProduct.value')
+    // console.log(currentProduct.value, 'currentProduct.value')
   }
   if (newVal && dataForm.value.alarmJudgeMethod === '0') {
     fetchAlarmEvent(newVal)
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index 200e55d..7627e8f 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -42,7 +42,7 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [ { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] } ],
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -113,17 +113,28 @@
       ...JSON.parse(JSON.stringify(row)),
     }
     initDeviceCode.value = dataForm.value.devcode
-    // console.log(row, '123')
-    list.value = [
-      {
-        edit: dialogStatus.value === 'edit',
-        alarmRuleId: row.alarmRuleId,
-        alarmLevelId: row.alarmLevelId,
-        alarmThreshold: row.alarmThreshold,
-        alarmTypeId: row.alarmTypeId,
-        isConcentration: row.alarmType.includes('浓度'),
-      },
-    ]
+    console.log(row, '123')
+    const alarmLevelIds = dataForm.value.alarmLevelIds.split(',')
+    const alarmRuleIds = dataForm.value.alarmRuleIds.split(',')
+    const alarmThresholds = dataForm.value.alarmThresholds.split(',')
+    list.value = alarmLevelIds.map((item: string, index: number) => ({
+      edit: dialogStatus.value === 'edit',
+      alarmRuleId: alarmRuleIds[index],
+      alarmThreshold: alarmThresholds[index],
+      alarmLevelId: item,
+      alarmTypeId: row.alarmTypeId,
+      isConcentration: row.alarmType.includes('浓度'),
+    }))
+    // list.value = [
+    //   {
+    //     edit: dialogStatus.value === 'edit',
+    //     alarmRuleId: row.alarmRuleId,
+    //     alarmLevelId: row.alarmLevelId,
+    //     alarmThreshold: row.alarmThreshold,
+    //     alarmTypeId: row.alarmTypeId,
+    //     isConcentration: row.alarmType.includes('浓度'),
+    //   },
+    // ]
     initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
@@ -241,7 +252,7 @@
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
   }))
-  console.log(data, 'data')
+  // console.log(data, 'data')
   if (dialogStatus.value === 'edit') {
     updateData(data)
   }
@@ -346,11 +357,11 @@
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
       alarmRuleList.value = alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
-      .map((item:any) => ({
-        name: item.alarmName,
-        id: item.id,
-        typeId: item.alarmTypeId
-      }))
+        .map((item: any) => ({
+          name: item.alarmName,
+          id: item.id,
+          typeId: item.alarmTypeId
+        }))
       // console.log(alarmRuleAllList.value.filter((item: any) => item.productId === dataForm.value.productId))
       // console.log(alarmRuleList.value, 'alarmRuleList.value')
       // 根据设备类型寻找报警类型
@@ -362,7 +373,7 @@
       //       value: item.id,
       //     }))
       // })
-     return
+      return
     }
     if (isFirst.value) {
       return
@@ -478,7 +489,7 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>%LEL</span>
+                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index e7aaa76..1c61f9f 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -8,6 +8,7 @@
 import editDialog from './components/editDialog.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getSpecialAlarmRuleListPage, removeSpecialAlarmRule } from '@/api/home/rule/special'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 // 表格数据
 const list = ref([])
@@ -40,7 +41,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSpecialAlarmRuleListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      createUser: isEncrypt(item.createUser) ? decrypt(item.createUser) : item.createUser,
+    }))
     total.value = res.data.total
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 2ded69b..c8ed6a2 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index 6dd1585..15044c2 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   // listQuery.value.devcode = $route.query.deviceCode as string
   // listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
       list.value = list.value.map((item:any) => ({
         ...item,
@@ -217,7 +217,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
@@ -279,7 +279,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -300,7 +300,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -313,7 +313,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -382,9 +382,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 6d3b478..161549d 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -63,7 +63,7 @@
   { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
-  { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -88,7 +88,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
-if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+if (!$route.query.typeName || $route.query.typeName.includes('燃气智能监测终端')) {
   columns.value = columns1.value
 }
 else if ($route.query.typeName.includes('管网哨兵')) {
@@ -148,7 +148,7 @@
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
   getDataSearch(listQuery.value).then(res => {
-    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
+    list.value = res.data.map((item: any) => toHumpObject(item))
     if (listQuery.value.typeName === '智能警示桩') {
       const dict = {
         0: '正常',
@@ -156,12 +156,12 @@
       } as { [key: string]: string }
       list.value = list.value.map((item: any) => ({
         ...item,
-        pipeInclineAlarm: item.pipeInclineAlarm === '1' || item.pipeInclineAlarm === '0' ? dict[item.pipeInclineAlarm] : item.pipeInclineAlarm,
-        pipeBreakAlarm: item.pipeBreakAlarm === '1' || item.pipeBreakAlarm === '0' ? dict[item.pipeBreakAlarm] : item.pipeBreakAlarm,
-        leftOffLineAlarm: item.leftOffLineAlarm === '1' || item.leftOffLineAlarm === '0' ? dict[item.leftOffLineAlarm] : item.leftOffLineAlarm,
-        leftVibrateAlarm: item.leftVibrateAlarm === '1' || item.leftVibrateAlarm === '0' ? dict[item.leftVibrateAlarm] : item.leftVibrateAlarm,
-        rightOffLineAlarm: item.rightOffLineAlarm === '1' || item.rightOffLineAlarm === '0' ? dict[item.rightOffLineAlarm] : item.rightOffLineAlarm,
-        rightVibrateAlarm: item.rightVibrateAlarm === '1' || item.rightVibrateAlarm === '0' ? dict[item.rightVibrateAlarm] : item.rightVibrateAlarm,
+        pipeInclineAlarm: String(item.pipeInclineAlarm) === '1' || String(item.pipeInclineAlarm) === '0' ? dict[(item.pipeInclineAlarm)] : item.pipeInclineAlarm,
+        pipeBreakAlarm: String(item.pipeBreakAlarm) === '1' || String(item.pipeBreakAlarm) === '0' ? dict[(item.pipeBreakAlarm)] : item.pipeBreakAlarm,
+        leftOffLineAlarm: String(item.leftOffLineAlarm) === '1' || String(item.leftOffLineAlarm) === '0' ? dict[(item.leftOffLineAlarm)] : item.leftOffLineAlarm,
+        leftVibrateAlarm: String(item.leftVibrateAlarm) === '1' || String(item.leftVibrateAlarm) === '0' ? dict[(item.leftVibrateAlarm)] : item.leftVibrateAlarm,
+        rightOffLineAlarm: String(item.rightOffLineAlarm) === '1' || String(item.rightOffLineAlarm) === '0' ? dict[(item.rightOffLineAlarm)] : item.rightOffLineAlarm,
+        rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || (item.rightVibrateAlarm) === '0' ? dict[(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
       }))
     }
     if(listQuery.value.typeName.includes('燃气智能监测终端')) {
@@ -171,7 +171,7 @@
       }))
     }
     if (listQuery.value.typeName.includes('管网哨兵')) {
-      xAxisData.value = list.value.slice().map(item => item.logtime)
+      xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
       let markLineData = [] as any[]
 
       if (list.value.length) {
@@ -233,7 +233,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
                 markLine: {
                   data: markLineData,
@@ -254,7 +254,7 @@
             chartData.value = [
               {
                 name: '燃气浓度',
-                data: list.value.slice().map(item => item.gasval || '0'),
+                data: list.value.slice().reverse().map(item => item.gasval || '0'),
                 symbol: list.value.length > 1 ? 'none' : 'circle',
               },
             ]
@@ -267,7 +267,7 @@
           chartData.value = [
             {
               name: '燃气浓度',
-              data: list.value.slice().map(item => item.gasval || '0'),
+              data: list.value.slice().reverse().map(item => item.gasval || '0'),
               symbol: list.value.length > 1 ? 'none' : 'circle',
             },
           ]
@@ -353,9 +353,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4vbat': item.vbat, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `管网哨兵${list.value[0].devcode}燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电池电压(mV)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/home/well/components/maintenanceRecord.vue b/src/views/home/well/components/maintenanceRecord.vue
index 23e96a7..a59de9b 100644
--- a/src/views/home/well/components/maintenanceRecord.vue
+++ b/src/views/home/well/components/maintenanceRecord.vue
@@ -7,6 +7,7 @@
 import { getRepairLog } from '@/api/home/well/well'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -37,11 +38,18 @@
 onMounted(async () => {
   await fetchDict()
   loadingTable.value = true
+  if(!$route.query.id) {
+    loadingTable.value = false
+    return
+  }
   getRepairLog($route.query.id as string).then((res) => {
     list.value = res.data.map((item: any) => ({
       ...item,
       logTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.logType)[0]?.name || '',
       operatePersonName: userList.value.filter((citem: any) => citem.value === item.operatePerson || '')[0]?.name || '',
+    })).map((item: any) => ({
+      ...item,
+      operatePersonName: isEncrypt(item.operatePersonName) ? decrypt(item.operatePersonName) : item.operatePersonName,
     }))
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 6061f81..0e9915f 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -31,9 +31,8 @@
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'rsrp', align: 'center' },
   { text: '信号质量', value: 'rsrpName', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
-  // { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   logBegTime: '',
@@ -222,9 +221,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportExcel({
-    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3gasval': item.gasval, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, '7status': item.status })),
+    json: list.value.map((item: any, index: number) => ({ '1index': index + 1, '2devcode': item.devcode, '3strength': item.strength, '4cell': item.cell, '5uptime': item.uptime, '6logtime': item.logtime, })),
     name: `燃气数据`,
-    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间', '设备状态'],
+    titleArr: ['序号', '设备编号', '燃气浓度（%LEL)', '电量(%)', '采集时间', '上传时间'],
     sheetName: 'sheet1',
   })
   loading.close()
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index 0a1c088..95c921b 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -86,6 +86,7 @@
       }
     })
 }
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -95,7 +96,8 @@
     <div class="bg" />
     <!-- title -->
     <div class="title">
-      北燃施工管理助手
+      <!-- 北燃施工管理助手 -->
+       {{ title }}
     </div>
     <!-- 用户名/密码 -->
     <div class="user">
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 133116b..1b7b85e 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import { RSAencrypt } from '@/utils/security'
 import useMenuStore from '@/store/modules/menu'
+import { getKaptcha } from '@/api/system/login'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -37,18 +38,30 @@
 const sid = ref('')
 
 // 获取系统基础配置： 公钥，是否开启验证码
+const kaptchaImg = ref('')
 function getBaseConfig() {
   userStore.getBaseConfig().then((res) => {
     showKaptcha.value = res.kaptcha
     publicKey.value = res.publicKey
     sid.value = res.sid
+    // 获取验证码
+    if (showKaptcha.value) {
+      getKaptcha(sid.value).then(res => {
+        kaptchaImg.value = res.data.kaptcha
+      })
+    }
     ElMessage({
       message: '连接服务器成功',
       type: 'success',
     })
   })
 }
-
+// 刷新验证码
+const resetkaptchaImg = () => {
+  getKaptcha(sid.value).then(res => {
+    kaptchaImg.value = res.data.kaptcha
+  })
+}
 // 登录
 const loginFormRef = ref<FormInstance>()
 const loginPasswordRef = ref<HTMLElement>()
@@ -64,6 +77,7 @@
     { required: true, trigger: 'blur', message: '请输入密码' },
     // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
   ],
+  kaptcha: [{ required: true, trigger: ['blur', 'change'], message: '请输入验证码' }],
 })
 
 // 处理登录
@@ -99,6 +113,9 @@
           })
           .catch(() => {
             loading.value = false
+            setTimeout(() => {
+              resetkaptchaImg()
+            }, 500);
           })
       }
     })
@@ -198,6 +215,7 @@
   localStorage.setItem('eventAudio', '')
   // 清空面包屑
   menuStore.resetBreadcrumb()
+  localStorage.removeItem('token')
 })
 </script>
 
@@ -208,10 +226,8 @@
     </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <el-form
-        v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
-        class="login-form" autocomplete="on"
-      >
+      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules"
+        class="login-form" autocomplete="on">
         <div class="title-container">
           <h3 class="title">
             用户登录
@@ -228,10 +244,8 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
-              tabindex="2" autocomplete="on" @keyup.enter="handleLogin"
-            >
+            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码"
+              tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -239,24 +253,31 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon
-                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
-                    @click="showPassword(loginPasswordRef)"
-                  />
+                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)" />
                 </el-icon>
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item v-if="showKaptcha" prop="kaptcha">
+            <div style="width: 100%;display: flex;justify-content: space-between;">
+              <el-input ref="loginPasswordRef" v-model="loginForm.kaptcha" type="text" placeholder="验证码"
+                style="width: 60%;">
+              </el-input>
+              <img class="kaptcha-img" :src="kaptchaImg" alt="" style="width: 38%;height: 48px;"
+                @click="resetkaptchaImg">
+            </div>
+          </el-form-item>
         </div>
-        <div class="flex-bar">
+        <!-- <div class="flex-bar">
           <el-checkbox v-model="loginForm.remember">
             记住我
           </el-checkbox>
-        </div>
+        </div> -->
         <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <!-- <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
           <el-divider>演示账号一键登录</el-divider>
           <el-button type="primary" size="small" plain @click="testusername('admin')">
             admin
@@ -264,7 +285,7 @@
           <el-button size="small" plain @click="testusername('test')">
             test
           </el-button>
-        </div>
+        </div> -->
       </el-form>
     </div>
     <copyright />
@@ -319,6 +340,12 @@
   display: none;
 }
 
+.kaptcha-img {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .bg-top-banner {
   position: fixed;
   top: 0;
diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue
index bc20597..1db1608 100644
--- a/src/views/mobile/dashboard/index.vue
+++ b/src/views/mobile/dashboard/index.vue
@@ -80,6 +80,7 @@
 }
 // console.log(getCurrentInstance().proxy, 123)
 // showToast('请填写正确的手机号')
+const title = ref(window.localStorage.getItem('project-name') || import.meta.env.VITE_APP_TITLE)
 </script>
 
 <template>
@@ -87,7 +88,7 @@
     <!-- 背景图 -->
     <div class="bg" />
     <div class="title">
-      施工管理助手
+      {{ title }}
     </div>
     <!-- 菜单 -->
     <div class="menu-container">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 3857e6c..00d2224 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -10,34 +10,246 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { showToast, showLoadingToast, closeToast, showConfirmDialog } from 'vant'
 import { getWellListPage } from '@/api/home/well/well'
+// import { getSyncListPage } from '@/api/home/ledger/location'
+// import { showLoadingToast, closeToast } from 'vant'
+import { getDeviceListPage } from '@/api/home/device/device'
 import { getStationListPage } from '@/api/home/station/station'
 import AMap from '@/components/map/index.vue'
 import { keepSearchParams } from '@/utils/keepQuery'
 import { uploadApi } from '@/api/mobile/operation'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getTypeListByWellId } from '@/api/home/well/well'
+import useUserStore from '@/store/modules/user'
+import { findParentPids, toTreeList, findParentPids1 } from '@/utils/structure'
+import { addDeviceInstall } from '@/api/mobile/operation'
+import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import { getSyncListPage } from '@/api/home/ledger/location'
+import { addDevice, editDevice } from '@/api/mobile/device'
+const userInfo = useUserStore()
 const $router = useRouter()
-const deciceInfo = ref({
+const deviceInfo = ref({
   productId: '',
   productName: '',
   devcode: '',
   tagNumber: '',
   watchObject: '',
   installDate: '',
+  tagName: '',
+  typeName: '',
+  photo1: '',
+  photo2: '',
+  photo3: '',
+  deptid: '',
+  deptName: '',
+  position: '',
+  userName: '',
+  coordinate: '',
+  lng: '',
+  lat: '',
+  ledgerId: '',
+  ledgerIds: [],
+  pipeCode: '',
 })
-
+const mapRef = ref()
+const mapCenter = ref([116.397428, 39.90923])
+deviceInfo.value.coordinate = '116.397428, 39.90923'
+deviceInfo.value.lng = '116.397428'
+deviceInfo.value.lat = '39.90923'
+deviceInfo.value.userName = userInfo.name
 // 产品相关
 const showProduct = ref(false)
 const productValue = ref([])
 const productColumns = ref([])
 const onConfirm = ({ selectedValues, selectedOptions }) => {
-  deciceInfo.value.productId = selectedOptions[0]?.value
-  deciceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.productId = selectedOptions[0]?.value
+  deviceInfo.value.productName = selectedOptions[0]?.text
+  deviceInfo.value.typeName = selectedOptions[0]?.deviceTypeName
   productValue.value = selectedValues
   showProduct.value = false
 }
+// 验证设备编号是否存在
+const valiateDevcode = () => {
+  // if (!deviceInfo.value.devcode) {
+  //   const flag = document.getElementById('tag-flag')
+  //   if (flag) {
+  //     flag.style.top = '120px'
+  //   }
+  //   return
+  // }
+  // const flag = document.getElementById('tag-flag')
+  // if (flag) {
+  //   flag.style.top = '99px'
+  // }
+  // 查询系统中是否有该设备
+  // getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' }).then(res => {
+  //   if (res.data.rows.length) {
+  //     deviceInfo.value.devcode = ''
+  //     showToast('该设备编号已存在，请重新输入')
+  //   }
+  // })
+}
 // 安装位置 -- 闸井/场站
+const addType = ref('新建') // 新建/ 既有
+const changeAddType = () => {
+  if (addType.value === '新建') {
+    addType.value = '既有'
+  }
+  else {
+    addType.value = '新建'
+  }
+  // 清空 安装位置 闸井名称 详细位置 管理单位
+  deviceInfo.value.deptName = ''
+  deviceInfo.value.deptid = ''
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.coordinate = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+}
 const searchForWell = ref(false)
 const searchForInput = ref('')
 const resultForWell = ref(false)
+// 多个安装位置
+const showmultipleResult = ref(false) // 选择弹窗
+const checkedResult = ref('')
+const multipleResultList = ref([])
+const cancelMultipleResult = () => {
+  searchForWell.value = true
+}
+const confirmMultipleResult = () => {
+  // 获取选中的
+  const result = multipleResultList.value.filter((item: any) => item.value === checkedResult.value)[0] as any
+  showLoadingToast({
+    duration: 0,
+    message: '加载中...',
+    forbidClick: true,
+    loadingType: 'spinner',
+  })
+  // 判断当前闸井下是否含有同类设备
+  getTypeListByWellId({ id: result.id }).then(res => {
+    closeToast()
+    // 获取当前产品的设备类型
+    if (res.data.includes(deviceInfo.value.typeName)) {
+      // 已有设备类型
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
+    }
+    else {
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+      }).then(() => {
+        // 将选中的信息填充
+        deviceInfo.value.tagNumber = result.tagNumber
+        deviceInfo.value.tagName = result.ledgerName
+        deviceInfo.value.position = result.position
+        deviceInfo.value.deptid = result.deptid
+        deviceInfo.value.deptName = result.deptName
+        deviceInfo.value.lng = result.lngGaode
+        deviceInfo.value.lat = result.latGaode
+        deviceInfo.value.ledgerId = result.id
+        deviceInfo.value.ledgerIds = [result.id]
+        // deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+        // TODO: 设置地图位置
+        if (!result.lngGaode || !result.latGaode) {
+          showToast('位置信息无效，请联系管理员')
+          mapCenter.value = [116.397428, 39.90923]
+        }
+        else {
+          deviceInfo.value.lng = result.lngGaode
+          deviceInfo.value.lat = result.latGaode
+          deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+          // TODO: 设置地图位置
+          mapRef.value.removeMarker()
+          mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+          mapRef.value.map.setZoom(16)
+          mapRef.value.addMarker({
+            position: [result.lngGaode, result.latGaode],
+            content: '',
+            label: '',
+          })
+          mapCenter.value = [result.lngGaode, result.latGaode]
+        }
+        // 清空多选和多选结果
+        showmultipleResult.value = false
+        checkedResult.value = ''
+        multipleResultList.value = []
+
+        // 设置管理单位组件默认选中状态
+        const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+        deviceInfo.value.deptName = deptName
+        // 找到所有父级管理单位
+        let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+        if (ParentPids.length) {
+          ParentPids = ParentPids.reverse()
+          console.log(ParentPids, 'ParentPids')
+          ParentPids.push(result.deptid)
+          const dict = {
+            0: pickerGroupDept,
+            1: pickerUnitDept,
+            2: pickerDivisionDept,
+            3: pickerTeamDept,
+            4: pickerAreaDept
+          } as { [key: string]: any }
+          const listDict = {
+            0: groupDeptList,
+            1: unitDeptList,
+            2: divisionDeptList,
+            3: teamDeptList,
+            4: areaDeptList
+          } as { [key: string]: any }
+          ParentPids.forEach((item, index) => {
+            dict[index].value = [item]
+            if (index !== 0) {
+              listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                text: item.name, value: item.id, pValue: item.pid
+              }))
+            }
+          })
+        }
+        deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+        deptActiveTab.value = deptTabs.value.length - 1
+        onConfirmDept(
+          ParentPids.map((item, index) => ({
+            selectedIndexes: [index],
+            selectedValues: [item],
+            selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+              text: item.name, value: item.id, pValue: item.pid
+            }))
+          }))
+        )
+      })
+        .catch(() => {
+          showmultipleResult.value = true
+        })
+    }
+  }).catch(() => {
+    closeToast()
+    showmultipleResult.value = true
+  })
+}
+const valiateMultipleResult = (action: string) => {
+  console.log(action, 'action')
+  if (action === 'cancel') {
+    return true
+  }
+  else {
+    if (checkedResult.value) {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+}
 // 搜索安装位置
 const searchTagNumber = (action: string) => {
   if (!action) {
@@ -49,46 +261,287 @@
     forbidClick: true,
     loadingType: 'spinner',
   });
+  const requestFunction = (watchObject: string, data: Object) => {
+    return (watchObject === '1' ? getWellListPage : watchObject === '2' ? getStationListPage : getPositionListPage)(data)
+    // 1: getWellListPage,
+    // 2: getStationListPage,
+    // 3: getPositionListPage
+  }
   // 搜索场站或闸井
-  (deciceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 1, tagNumber: searchForInput.value }).then(res => {
+  // (deviceInfo.value.watchObject === '1' ? getWellListPage : getStationListPage)({ offset: 1, limit: 10, tagNumber: searchForInput.value })
+  requestFunction(deviceInfo.value.watchObject, { offset: 1, limit: 10, tagNumber: searchForInput.value }).then(res => {
     closeToast()
     searchForWell.value = false
-    let message = ''
     if (!res.data.rows.length) {
-      message = `未找到位号为 ${searchForInput.value} ${deciceInfo.value.watchObject === '1' ? '闸井' : '场站'} ，请确认位号后重新搜索`
+      // 未找到
+      showConfirmDialog({
+        title: '搜索位置',
+        message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+      })
+        .then(() => {
+          searchForWell.value = true
+        })
+        .catch(() => {
+          searchForWell.value = true
+        })
     }
     else {
-      // 判断位置
-      // 存在同类设备
-      // 正常
+      if (res.data.rows.some((item: any) => item.tagNumber === searchForInput.value)) {
+        const data = res.data.rows.filter((item: any) => item.tagNumber === searchForInput.value)
+        if (data.length > 1) {
+          // 让用户选择
+          showmultipleResult.value = true
+          // 闸井 场站
+          // if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '2') {
+          multipleResultList.value = data.map((item: any) => ({
+            ...item,
+            value: item.id,
+            name: `${item.tagNumber}-${item.ledgerName}`
+          }))
+          // }
+          // 场站
+          // else if () {
+          //   multipleResultList.value = data.map((item: any) => ({
+          //     ...item,
+          //     value: item.id,
+          //     name: `${item.tagNumber}-${item.ledgerName}`
+          //   }))
+          // }
+        }
+        else {
+          const result = data[0]
+          showLoadingToast({
+            duration: 0,
+            message: '加载中...',
+            forbidClick: true,
+            loadingType: 'spinner',
+          })
+          if (deviceInfo.value.watchObject === '1') {
+            // 判断是否存在同类设备
+            getTypeListByWellId({ id: result.id }).then(res => {
+              closeToast()
+              // 获取当前产品的设备类型
+              if (res.data.includes(deviceInfo.value.typeName)) {
+                // 已有设备类型
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `位号为 ${result.tagNumber} 闸井中已存在在用的同类设备，无法保存。请重新选择或与系统管理员确认解除原绑定关系。`
+                })
+                  .then(() => {
+                    searchForWell.value = true
+                  })
+                  .catch(() => {
+                    searchForWell.value = true
+                  })
+              }
+              else {
+                showConfirmDialog({
+                  title: '搜索位置',
+                  message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '1' ? '闸井' : '场站'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+                }).then(() => {
+                  // 将选中的信息填充
+                  deviceInfo.value.tagNumber = result.tagNumber
+                  deviceInfo.value.tagName = result.ledgerName
+                  deviceInfo.value.position = result.position
+                  deviceInfo.value.deptid = result.deptid
+                  deviceInfo.value.deptName = result.deptName
+                  deviceInfo.value.ledgerId = result.id
+                  deviceInfo.value.ledgerIds = [result.id]
+                  if (!result.lngGaode || !result.latGaode) {
+                    showToast('位置信息无效，请联系管理员')
+                    mapCenter.value = [116.397428, 39.90923]
+                  }
+                  else {
+                    deviceInfo.value.lng = result.lngGaode
+                    deviceInfo.value.lat = result.latGaode
+                    deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                    // TODO: 设置地图位置
+                    mapRef.value.removeMarker()
+                    mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                    mapRef.value.map.setZoom(16)
+                    mapRef.value.addMarker({
+                      position: [result.lngGaode, result.latGaode],
+                      content: '',
+                      label: '',
+                    })
+                    mapCenter.value = [result.lngGaode, result.latGaode]
+                  }
+
+
+                  // 设置管理单位组件默认选中状态
+                  const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+                  deviceInfo.value.deptName = deptName
+                  // 找到所有父级管理单位
+                  let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+                  if (ParentPids.length) {
+                    ParentPids = ParentPids.reverse()
+                    console.log(ParentPids, 'ParentPids')
+                    ParentPids.push(result.deptid)
+                    const dict = {
+                      0: pickerGroupDept,
+                      1: pickerUnitDept,
+                      2: pickerDivisionDept,
+                      3: pickerTeamDept,
+                      4: pickerAreaDept
+                    } as { [key: string]: any }
+                    const listDict = {
+                      0: groupDeptList,
+                      1: unitDeptList,
+                      2: divisionDeptList,
+                      3: teamDeptList,
+                      4: areaDeptList
+                    } as { [key: string]: any }
+                    ParentPids.forEach((item, index) => {
+                      dict[index].value = [item]
+                      if (index !== 0) {
+                        listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                          text: item.name, value: item.id, pValue: item.pid
+                        }))
+                      }
+                    })
+                  }
+                  deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+                  deptActiveTab.value = deptTabs.value.length - 1
+                  onConfirmDept(
+                    ParentPids.map((item, index) => ({
+                      selectedIndexes: [index],
+                      selectedValues: [item],
+                      selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                        text: item.name, value: item.id, pValue: item.pid
+                      }))
+                    }))
+                  )
+                })
+                  .catch(() => {
+                    // showmultipleResult.value = true
+                    searchForWell.value = true
+                  })
+              }
+            }).catch(() => {
+              closeToast()
+              searchForWell.value = true
+            })
+          }
+          else if (deviceInfo.value.watchObject === '2' || deviceInfo.value.watchObject === '3') {
+            closeToast()
+            showConfirmDialog({
+              title: '搜索位置',
+              message: `已找到位号为 ${result.tagNumber} 的${deviceInfo.value.watchObject === '2' ? '场站' : '位置'}, 名称为${result.ledgerName}，管理单位为${result.deptName}，详细位置为${result.position}`
+            }).then(() => {
+              // 将选中的信息填充
+              deviceInfo.value.tagNumber = result.tagNumber
+              deviceInfo.value.tagName = result.ledgerName
+              deviceInfo.value.position = result.position
+              deviceInfo.value.deptid = result.deptid
+              deviceInfo.value.deptName = result.deptName
+              deviceInfo.value.ledgerId = result.id
+              deviceInfo.value.ledgerIds = [result.id]
+              if (deviceInfo.value.watchObject === '3') {
+                deviceInfo.value.pipeCode = result.pipeCode
+              }
+              if (!result.lngGaode || !result.latGaode) {
+                showToast('位置信息无效，请联系管理员')
+                mapCenter.value = [116.397428, 39.90923]
+              }
+              else {
+                deviceInfo.value.lng = result.lngGaode
+                deviceInfo.value.lat = result.latGaode
+                deviceInfo.value.coordinate = `${result.lngGaode},${result.latGaode}`
+                // TODO: 设置地图位置
+                mapRef.value.removeMarker()
+                mapRef.value.map.setCenter([result.lngGaode, result.latGaode])
+                mapRef.value.map.setZoom(16)
+                mapRef.value.addMarker({
+                  position: [result.lngGaode, result.latGaode],
+                  content: '',
+                  label: '',
+                })
+                mapCenter.value = [result.lngGaode, result.latGaode]
+              }
+
+              searchForWell.value = false
+              // 设置管理单位组件默认选中状态
+              const deptName = allDeptList.value.filter(item => item.id === result.deptid)[0].name
+              deviceInfo.value.deptName = deptName
+              // 找到所有父级管理单位
+              let ParentPids = findParentPids1(allDeptList.value.filter(item => item.id !== '0'), deviceInfo.value.deptid)
+              if (ParentPids.length) {
+                ParentPids = ParentPids.reverse()
+                console.log(ParentPids, 'ParentPids')
+                ParentPids.push(result.deptid)
+                const dict = {
+                  0: pickerGroupDept,
+                  1: pickerUnitDept,
+                  2: pickerDivisionDept,
+                  3: pickerTeamDept,
+                  4: pickerAreaDept
+                } as { [key: string]: any }
+                const listDict = {
+                  0: groupDeptList,
+                  1: unitDeptList,
+                  2: divisionDeptList,
+                  3: teamDeptList,
+                  4: areaDeptList
+                } as { [key: string]: any }
+                ParentPids.forEach((item, index) => {
+                  dict[index].value = [item]
+                  if (index !== 0) {
+                    listDict[index].value = allDeptList.value.filter(item => item.pid === ParentPids[index - 1]).map((item: { name: string; id: string; pid: string }) => ({
+                      text: item.name, value: item.id, pValue: item.pid
+                    }))
+                  }
+                })
+              }
+              deptTabs.value = ['集团', '单位', '部门', '班组', '片区'].slice(0, ParentPids.length)
+              deptActiveTab.value = deptTabs.value.length - 1
+              onConfirmDept(
+                ParentPids.map((item, index) => ({
+                  selectedIndexes: [index],
+                  selectedValues: [item],
+                  selectedOptions: allDeptList.value.filter((citem) => citem.id === item).map((item: { name: string; id: string; pid: string }) => ({
+                    text: item.name, value: item.id, pValue: item.pid
+                  }))
+                }))
+              )
+            })
+              .catch(() => {
+                // showmultipleResult.value = true
+                searchForWell.value = true
+              })
+          }
+        }
+      }
+      else {
+        showConfirmDialog({
+          title: '搜索位置',
+          message: `未找到位号为 ${searchForInput.value} ${deviceInfo.value.watchObject === '1' ? '闸井' : deviceInfo.value.watchObject === '2' ? '场站' : '位置'} ，请确认位号后重新搜索`
+        })
+          .then(() => {
+            searchForWell.value = true
+          })
+          .catch(() => {
+            searchForWell.value = true
+          })
+      }
+
     }
-    // 展示查询结果
-    showConfirmDialog({
-      title: '搜索位置',
-      message: '123123123232121'
-    })
-      .then(() => {
-
-      })
-      .catch(() => {
-
-      })
   })
 
 }
 // 选择安装位置
-const selectTagNumber = () => {
-  if (!deciceInfo.value.productId) {
+const selectTagNumber = (event: any) => {
+  console.log(event.target.classList, 'event')
+  if(event.target.innerText === '既有' || (Array(event.target.classList || [])).includes('el-tag')) {
+    return
+  }
+  if (!deviceInfo.value.productId) {
     showToast('请先选择产品')
     return
   }
   //1闸井 2场站 3管线
-  if (deciceInfo.value.watchObject == '1' || deciceInfo.value.watchObject == '2') {
-    searchForWell.value = true
-    searchForInput.value = ''
-  }
-  // else {
-
+  // if (deviceInfo.value.watchObject == '1' || deviceInfo.value.watchObject == '2') {
+  searchForWell.value = true
+  searchForInput.value = ''
   // }
 }
 // 安装日期
@@ -96,17 +549,188 @@
 const pickerValueInstallDate = ref<string[]>([])
 // 默认日期
 pickerValueInstallDate.value = dayjs().format('YYYY-MM-DD').split('-')
-deciceInfo.value.installDate = pickerValueInstallDate.value.join('-')
+deviceInfo.value.installDate = pickerValueInstallDate.value.join('-')
 const onConfirmInstallDate = ({ selectedValues }) => {
-  deciceInfo.value.installDate = selectedValues.join('-')
+  deviceInfo.value.installDate = selectedValues.join('-')
   pickerValueInstallDate.value = selectedValues
   showDatePicker.value = false
 }
+// 管理单位
+const showDept = ref(false)
+const deptActiveTab = ref(0)
+const deptTabs = ref<string[]>(['集团'])
+const loadingDept = ref(false)
+const allDeptList = ref<{ name: string; id: string; pid: string }[]>([]) // 管理单位
+const groupDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 集团
+const unitDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 单位
+const divisionDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 部门
+const teamDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 班组
+const areaDeptList = ref<{ text: string; value: string; pValue: string }[]>([]) // 片区
+// 选择集团
+const pickerGroupDept = ref<string[]>([])  // 选中的集团
+const pickerUnitDept = ref<string[]>([])  // 选中的单位
+const pickerDivisionDept = ref<string[]>([])  // 选中的部门
+const pickerTeamDept = ref<string[]>([])  // 选中的班组
+const pickerAreaDept = ref<string[]>([])  // 选中的片区
+// 集团选项变化
+const changeGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 单位 部门 班组
+  unitDeptList.value = []
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerUnitDept.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充单位
+    unitDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    unitDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerUnitDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位']
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 点击集团直接确定选项
+const clickGroupDept = ({ selectedValues, selectedOptions }: any) => {
+  if (!selectedOptions[0].text.includes('全部')) {
+    changeGroupDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位']
+    setTimeout(() => {
+      deptActiveTab.value = 1
+    }, 300)
+  }
+  else {
+    deptTabs.value = ['集团']
+  }
+}
+// 单位选项变化
+const changeUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 部门 班组
+  divisionDeptList.value = []
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerDivisionDept.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 部门
+    divisionDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    divisionDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerDivisionDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    deptTabs.value = ['集团', '单位']
+  }
+}
+// 点击单位直接确定选项
+const clickUnitDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位']
+    // showDept.value = false
+    // 确定
+    // searchQuery.value.deptid = selectedOptions[0].value
+    // searchQueryForNames.value.deptName = allDeptList.value.filter(item => item.id === selectedOptions[0].value)[0].name
+  }
+  else {
+    changeUnitDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门']
+    setTimeout(() => {
+      deptActiveTab.value = 2
+    }, 300)
+  }
+}
+// 部门选项变化
+const changeDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  // 清空 班组
+  teamDeptList.value = []
+  areaDeptList.value = []
+  pickerTeamDept.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 班组
+    teamDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    teamDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerTeamDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+}
+// 点击部门直接确定选项
+const clickDivisionDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门']
+  }
+  else {
+    changeDivisionDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+    setTimeout(() => {
+      deptActiveTab.value = 3
+    }, 300)
+  }
+}
+// 班组选项变化
+const changeTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  areaDeptList.value = []
+  pickerAreaDept.value = []
+  if (!selectedOptions[0].text.includes('全部')) {
+    // 填充 片区
+    areaDeptList.value = allDeptList.value.filter(item => item.pid === selectedValues[0]).map((item: { name: string; id: string; pid: string }) => ({ text: item.name, value: item.id, pValue: item.pid }))
+    areaDeptList.value.unshift({ text: '全部', value: selectedOptions[0].value, pValue: selectedOptions[0].pValue })
+    pickerAreaDept.value = [selectedOptions[0].value as string]
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+  }
+  else {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+}
+// 点击班组
+const clickTeamDept = ({ selectedValues, selectedOptions }: any) => {
+  if (selectedOptions[0].text.includes('全部')) {
+    deptTabs.value = ['集团', '单位', '部门', '班组']
+  }
+  else {
+    changeTeamDept({ selectedValues, selectedOptions })
+    deptTabs.value = ['集团', '单位', '部门', '班组', '片区']
+    setTimeout(() => {
+      deptActiveTab.value = 4
+    }, 300)
+  }
+}
+// 选择管理单位
+const selectDept = () => {
+  if (deviceInfo.value.watchObject === '2' || addType.value === '既有') {
+    return
+  }
+  showDept.value = true
+}
+// 确认管理单位
+const onConfirmDept = (data: any[]) => {
+  const dict = {
+    0: pickerGroupDept,
+    1: pickerUnitDept,
+    2: pickerDivisionDept,
+    3: pickerTeamDept,
+    4: pickerAreaDept
+  } as { [key: string]: any }
+  data.forEach((item: any, index: number) => {
+    dict[index].value = item.selectedValues
+  })
+  deviceInfo.value.deptid = data[deptTabs.value.length - 1].selectedValues
+  deviceInfo.value.deptName = allDeptList.value.filter(item => item.id === data[deptTabs.value.length - 1].selectedValues[0])[0].name
+  showDept.value = false
+}
 // 现场照片
 const photo = ref<string[]>([])
 // 拍照
 const takePictures = () => {
-  if (deciceInfo.value.photo.length >= 3) {
+  if (photo.value.length >= 3) {
     showToast('最多上传三张照片')
     return
   }
@@ -121,24 +745,33 @@
     const file = event.target.files[0]
     const fd = new FormData()
     fd.append('file', file)
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     uploadApi(fd).then(res => {
       photo.value.push(res.data as string)
       fileRef.value.value = ''
+      resizePage()
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
     // const reader = new FileReader() // 实例化FileReader
     // reader.readAsDataURL(file)
     // 读取成功以后执行的方法
     // reader.onload = (e) => {
-    //   deciceInfo.value.photo.push(e.target.result)
-      // let img = new Image()
-      // // base64
-      // img.src = e.target.result
-      // console.log(img.src, 'img.src')
-      // img.onload = () => {
-      //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
-      // }
+    //   deviceInfo.value.photo.push(e.target.result)
+    // let img = new Image()
+    // // base64
+    // img.src = e.target.result
+    // console.log(img.src, 'img.src')
+    // img.onload = () => {
+    //   imagetoCanvas(img) //Image 对象转变为一个 Canvas 类型对象,i为遍历的下标
+    // }
     // }
   }
 }
@@ -151,46 +784,73 @@
 // 删除图片
 const deletePhoto = (index: number) => {
   photo.value.splice(index, 1)
+  resizePage()
 }
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: photo.value,
+    images: photo.value.map((item: string) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
 // 获取字典
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const loadingProduct = ref(true)
 const fetchDict = () => {
   getProductListPage({ offset: 1, limit: 9999 }).then(res => {
     productColumns.value = res.data.rows.map((item: any) => ({
       text: `${item.productName}-${item.productCode}`,
       value: item.id,
       deviceType: item.deviceType,
+      deviceTypeName: item.deviceTypeName,
     }))
+    loadingProduct.value = false
   })
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows
   })
+  // 获取管理单位
+  loadingDept.value = true
+  getDeptTreeList().then(res => {
+    allDeptList.value = res.data
+    groupDeptList.value = res.data.filter((item: { name: string; id: string; pid: string }) => item.pid === '0').map((item: { name: string; id: string; pid: string }) => ({
+      text: item.name, value: item.id, pValue: item.pid
+    }))
+    // groupDeptList.value.unshift({ text: '全部', value: '', pValue: '' })
+    loadingDept.value = false
+  }).catch(() => {
+    loadingDept.value = false
+  })
 }
 fetchDict()
 // 监听产品变化，判断该设备的 监测对象
-watch(() => deciceInfo.value.productId, (newVal) => {
+watch(() => deviceInfo.value.productId, (newVal) => {
   if (newVal) {
     const select = productColumns.value.filter((item: any) => item.value === newVal) as any
     const watchObject = deviceTypeList.value.filter((item: any) => item.id === select[0].deviceType)
-    deciceInfo.value.watchObject = watchObject[0].watchObject
+    deviceInfo.value.watchObject = watchObject[0].watchObject
+    //1闸井 2场站 3管线
+    console.log(deviceInfo.value.watchObject, '1闸井 2场站 3管线')
+    if (deviceInfo.value.watchObject === '2') {
+      addType.value = '既有'
+    }
+    else {
+      addType.value = '新建'
+    }
   }
-  else {
-    deciceInfo.value.tagNumber = ''
-    deciceInfo.value.watchObject = ''
-  }
+  // else {
+  deviceInfo.value.tagNumber = ''
+  deviceInfo.value.tagName = ''
+  deviceInfo.value.position = ''
+  deviceInfo.value.ledgerId = ''
+  deviceInfo.value.ledgerIds = []
+  // deviceInfo.value.watchObject = ''
+  // }
 })
 
-
 // 计算地图区域高度
 const scrollHeight = ref(0)
-const calcHeight = () => {
+function calcHeight() {
   // 公共头部高度40
   // 边距安全 30
   // 底部按钮
@@ -206,38 +866,221 @@
 window.addEventListener('resize', () => {
   calcHeight()
 })
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
 // 地图操作
-const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+
+  // 地图移动
+  mapRef.value.map.on('moveend', () => {
+    mapRef.value.removeMarker()
+    mapRef.value.addMarker({
+      position: mapRef.value.map.getCenter(),
+      content: '',
+      label: '',
+    })
+    mapCenter.value = [mapRef.value.map.getCenter().lng, mapRef.value.map.getCenter().lat]
+    deviceInfo.value.coordinate = `${mapCenter.value[0]},${mapCenter.value[1]}`
+    deviceInfo.value.lng = `${mapCenter.value[0]}`
+    deviceInfo.value.lat = `${mapCenter.value[1]}`
+  })
+
+  // 获取当前位置
+  mapRef.value.getLocation((a, b) => {
+    console.log('success', a, b)
+  }, (a, b) => {
+    console.log('error', a, b)
+  })
+}
 // 当前状态  收起retract/展开expand
 const mapStatus = ref('expand')
 const changeStatus = () => {
+
   if (mapStatus.value === 'expand') {
     mapStatus.value = 'retract'
   }
   else {
     mapStatus.value = 'expand'
   }
+  resizePage()
 
 }
 // 重置地图到初始状态
 const resetMap = () => {
-  // mapRef.value.map.setCenter(position.value)
-  // mapRef.value.map.setZoom(17.5)
+  mapRef.value.map.setCenter(mapCenter.value)
+  mapRef.value.map.setZoom(16)
 }
 
+// 保存
+const formRef = ref()
+const loading = ref(false)
+const save = () => {
+  if (!photo.value.length) {
+    showToast('请上传现场照片')
+    return
+  }
+  if ((!deviceInfo.value.coordinate || !deviceInfo.value.lat || !deviceInfo.value.lng)) {
+    if (addType.value === '新建') {
+      showToast('请选择位置')
+      return
+    }
+    showToast('位置信息无效，请联系管理员')
+    return
+  }
+  formRef.value.validate(['productId', 'devcode', 'tagNumber', 'tagName', 'position', 'deptName', 'installDate']).then(async () => {
+    loading.value = true
+    // 判断设备是否存在
+    const response = await getDeviceListPage({ devCode: deviceInfo.value.devcode, offset: '1', limit: '1' })
+    if (response.data.rows.length && response.data.rows[0]?.validName === '在用') {
+      showToast('设备已经存在系统中,并且状态为在用,不支持再次新装')
+      loading.value = false
+      return
+    } else if (response.data.rows.length) {
+      const data = response.data.rows[0]
+      if (data.productId !== deviceInfo.value.productId || data.typeName !== deviceInfo.value.typeName) {
+        showToast('该设备已经存在系统,并且产品或设备类型和当前设备不一致，请确认')
+        loading.value = false
+        return
+      }
+    }
+    const add = () => {
+      const data = {
+        watchObject: deviceInfo.value.watchObject,
+        typeName: deviceInfo.value.typeName,
+        tagNumber: deviceInfo.value.tagNumber,
+        tagName: deviceInfo.value.tagName,
+        position: deviceInfo.value.position,
+        lng: deviceInfo.value.lng,
+        lat: deviceInfo.value.lat,
+        installDate: deviceInfo.value.installDate,
+        devcode: deviceInfo.value.devcode,
+        deptid: deviceInfo.value.deptid[0],
+        deptName: deviceInfo.value.deptName,
+        productId: deviceInfo.value.productId,
+        ledgerIds: deviceInfo.value.ledgerIds,
+        ledgerId: deviceInfo.value.ledgerId,
+        deviceType: deviceTypeList.value.filter((item: any) => item.typeName === deviceInfo.value.typeName)[0].id,
+        photo1: '',
+        photo2: '',
+        photo3: '',
+      }
+      photo.value.forEach((item: any, index: number) => {
+        data[`photo${index + 1}`] = item
+      });
+      (response.data.rows.length ? editDevice : addDevice)({ ...data, valid: '1', id: response.data.rows.length ? response.data.rows[0].id : undefined }).then(res => {
+        console.log(res.data, '新增成功')
+        // 添加运维记录
+        addDeviceInstall({
+          repairType: '1',
+          repairTypeName: '新装',
+          devcode: deviceInfo.value.devcode,
+          ledgerNumber: deviceInfo.value.tagNumber,
+          position: deviceInfo.value.position,
+          repairTime: deviceInfo.value.installDate,
+          repairPerson: deviceInfo.value.userName,
+          repairContent: '新装设备',
+          deptid: data.deptid,
+          deviceType: data.deviceType,
+          ledgerName: data.tagName,
+          photo1: data.photo1,
+          photo2: data.photo2,
+          photo3: data.photo3,
+        }).then(res => {
+          showToast('新增成功')
+          loading.value = false
+          $router.push({
+            name: 'DeviceAddSuccess',
+            query: {
+              row: JSON.stringify(deviceInfo.value)
+            }
+          })
+        })
+      })
+    }
+    // add()
+    if (addType.value === '新建') {
+      if (deviceInfo.value.watchObject === '1' || deviceInfo.value.watchObject === '3') {
+        //  闸井
+        // 先查找是否含有该点位
+        (deviceInfo.value.watchObject === '1' ? getSyncListPage : getPositionListPage)({ tagNumber: deviceInfo.value.tagNumber, deptId: deviceInfo.value.deptid[0], offset: 1, limit: 1 }).then(res => {
+          if (res.data.rows.length) {
+            //  已经含有
+            showConfirmDialog({
+              title: '提示',
+              message: `该点位已经存在，确认编辑该点位信息?`
+            })
+              .then(() => {
+                editPosition({
+                  deptid: deviceInfo.value.deptid[0],
+                  latGaode: deviceInfo.value.lat,
+                  lngGaode: deviceInfo.value.lng,
+                  ledgerName: deviceInfo.value.tagName,
+                  position: deviceInfo.value.position,
+                  tagNumber: deviceInfo.value.tagNumber,
+                  id: res.data.rows[0].id,
+                  pipeCode: deviceInfo.value.pipeCode,
+                  type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+                }).then(() => {
+                  deviceInfo.value.ledgerId = res.data.rows[0].id
+                  deviceInfo.value.ledgerIds = [res.data.rows[0].id]
+                  add()
+                }).catch(() => {
+                  loading.value = false
+                })
+              })
+              .catch(() => {
+                loading.value = false
+              })
+          }
+          else {
+            // 没有该点位
+            addPosition({
+              deptid: deviceInfo.value.deptid[0],
+              latGaode: deviceInfo.value.lat,
+              lngGaode: deviceInfo.value.lng,
+              ledgerName: deviceInfo.value.tagName,
+              position: deviceInfo.value.position,
+              tagNumber: deviceInfo.value.tagNumber,
+              pipeCode: deviceInfo.value.pipeCode,
+              type: deviceInfo.value.watchObject === '1' ? '1' : '3',
+            }).then(res => {
+              deviceInfo.value.ledgerId = res.data
+              deviceInfo.value.ledgerIds = [res.data]
+              add()
+            })
+          }
+        })
+      }
+    }
+    else {
+      add()
+    }
+  })
+}
 // 查看数据
 const deviceData = () => {
-  if (!deciceInfo.value.devcode) {
+  if (!deviceInfo.value.devcode) {
     showToast('设备编号不能为空')
     return
   }
   $router.push({
     name: 'OperationData',
     query: {
-      devcode: deciceInfo.value.devcode
+      devcode: deviceInfo.value.devcode
     }
   })
 }
@@ -248,33 +1091,116 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div id="info-area" class="device-info">
       <span class="title">设备信息</span>
-      <van-form>
+      <van-form ref="formRef">
         <van-cell-group>
           <!-- 产品 -->
-          <van-field v-model="deciceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
-            required @click="showProduct = true" input-align="right">
+          <van-field v-model="deviceInfo.productName" is-link readonly label="产品" name="productId" placeholder="选择产品"
+            required @click="showProduct = true" input-align="right" :rules="[{ required: true, message: '请选择产品' }]">
           </van-field>
           <van-popup v-model:show="showProduct" destroy-on-close position="bottom">
-            <van-picker :columns="productColumns" title="产品" :model-value="productValue" @confirm="onConfirm"
-              @cancel="showProduct = false" />
+            <van-picker :columns="productColumns" :loading="loadingProduct" title="产品" :model-value="productValue"
+              @confirm="onConfirm" @cancel="showProduct = false" />
           </van-popup>
           <!-- 设备编号 -->
-          <van-field v-model="deciceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
-            input-align="right" />
+          <van-field v-model="deviceInfo.devcode" label="设备编号" name="devcode" placeholder="输入设备编号" required
+            input-align="right" @blur="valiateDevcode" :rules="[{ required: true, message: '输入设备编号' }]" />
+
           <!-- 安装位置 -->
-          <van-field v-model="deciceInfo.tagNumber" is-link readonly label="安装位置" name="tagNumber" placeholder="去搜索"
-            required @click="selectTagNumber" input-align="right" />
+          <van-field v-if="addType === '既有'" v-model="deviceInfo.tagNumber" is-link readonly label="安装位置"
+            name="tagNumber" placeholder="去搜索" required @click="(event) => selectTagNumber(event)" input-align="right"
+            :rules="[{ required: true, message: '请选择安装位置' }]">
+            <!-- 新建/既有 -->
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <!-- <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div> -->
+                  <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div>
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <van-dialog v-model:show="showmultipleResult" title="安装位置" show-cancel-button @cancel="cancelMultipleResult"
+            @confirm="confirmMultipleResult" :before-close="valiateMultipleResult">
+            <van-radio-group v-model="checkedResult">
+              <van-radio class="radio" v-for="item in multipleResultList" :name="item.value">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </van-dialog>
           <!-- 安装位置  闸井/场站查询-->
-          <van-dialog v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索" :closeOnClickOverlay="true"
-            :before-close="searchTagNumber">
+          <van-dialog v-if="addType === '既有'" v-model:show="searchForWell" title="搜索位置" confirm-button-text="搜索"
+            :closeOnClickOverlay="true" :before-close="searchTagNumber">
             <van-field v-model="searchForInput" placeholder="请输入安装位号" />
           </van-dialog>
+          <van-field v-if="addType === '新建'" v-model="deviceInfo.tagNumber" label="安装位置" name="devcode"
+            placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
+            <template #label>
+              <span style="position: relative;">
+                设备编号
+                <template v-if="deviceInfo.watchObject !== '2'">
+                  <div id="tag-flag" v-if="addType === '新建'"
+                    style="position: absolute;top: -4px; right: -80%;z-index: 10;">
+                    <el-tag type="success" @click="changeAddType">新建</el-tag>
+                  </div>
+                  <!-- <div id="tag-flag" v-if="addType === '既有'"
+                    style="position: absolute;top: 99px; left: 100px;z-index: 10;">
+                    <el-tag type="primary" @click="changeAddType">既有</el-tag>
+                  </div> -->
+                </template>
+              </span>
+            </template>
+          </van-field>
+          <!-- 名称 -->
+          <van-field v-if="deviceInfo.watchObject !== '3'" v-model="deviceInfo.tagName"
+            :label="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" name="tagName"
+            :placeholder="deviceInfo.watchObject === '1' ? '闸井名称' : '场站名称'" required input-align="right"
+            :rules="[{ required: true, message: `请输入${deviceInfo.watchObject === '1' ? '闸井' : '场站'}名称` }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 详细位置 -->
+          <van-field v-model="deviceInfo.position" label="详细位置" name="position" placeholder="详细位置" required
+            input-align="right" :rules="[{ required: true, message: '请输入详细位置' }]"
+            :readonly="deviceInfo.watchObject === '2' || addType === '既有'" />
+          <!-- 关联管线 -->
+          <van-field v-if="deviceInfo.watchObject === '3'" v-model="deviceInfo.pipeCode" label="关联管线" name="pipeCode"
+            placeholder="关联管线" input-align="right" :rules="[{ required: true, message: '请输入关联管线' }]"
+            :readonly="addType === '既有'" />
+          <!-- 管理单位 -->
+          <van-popup v-model:show="showDept" destroy-on-close position="bottom">
+            <!-- 树形选择 -->
+            <van-picker-group v-model:active-tab="deptActiveTab" title="管理单位" :tabs="deptTabs" @confirm="onConfirmDept"
+              @cancel="showDept = false">
+              <!-- 集团 -->
+              <van-picker v-show="deptTabs.includes('集团')" :loading="loadingDept" :swipe-duration="500"
+                :columns="groupDeptList" :model-value="pickerGroupDept" @change="changeGroupDept"
+                @click-option="clickGroupDept" />
+              <!-- 单位 -->
+              <van-picker v-show="deptTabs.includes('单位')" :swipe-duration="500" :columns="unitDeptList"
+                :model-value="pickerUnitDept" @change="changeUnitDept" @click-option="clickUnitDept" />
+              <!-- 部门 -->
+              <van-picker v-show="deptTabs.includes('部门')" :swipe-duration="500" :columns="divisionDeptList"
+                :model-value="pickerDivisionDept" @change="changeDivisionDept" @click-option="clickDivisionDept" />
+              <!-- 班组 -->
+              <van-picker v-show="deptTabs.includes('班组')" :swipe-duration="500" :columns="teamDeptList"
+                :model-value="pickerTeamDept" @change="changeTeamDept" @click-option="clickTeamDept" />
+              <!-- 片区 -->
+              <van-picker v-show="deptTabs.includes('片区')" :swipe-duration="500" :columns="areaDeptList"
+                :model-value="pickerAreaDept" />
+            </van-picker-group>
+          </van-popup>
+          <van-field v-model="deviceInfo.deptName" label="管理单位" name="position" placeholder="管理单位" required
+            input-align="right" readonly is-link :rules="[{ required: true, message: '请选择管理单位' }]"
+            @click="selectDept" />
           <!-- 安装日期 -->
-          <van-field v-model="deciceInfo.installDate" is-link readonly name="installDate" label="安装日期"
+          <van-field v-model="deviceInfo.installDate" is-link readonly name="installDate" label="安装日期"
             placeholder="点击选择时间" @click="showDatePicker = true" required input-align="right" />
           <van-popup v-model:show="showDatePicker" destroy-on-close position="bottom">
             <van-date-picker :model-value="pickerValueInstallDate" @confirm="onConfirmInstallDate"
@@ -299,6 +1225,10 @@
           <!-- 照相组件 -->
           <input ref="fileRef" style="display: none;opacity: 0;" multiple id="camera-photo" type="file" accept="image/*"
             @change="onFileChange">
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.coordinate" label="坐标" readonly name="position"
+            placeholder="坐标" required input-align="right" />
+          <van-field v-if="mapStatus !== 'expand'" v-model="deviceInfo.userName" label="操作人" readonly name="position"
+            placeholder="操作人" required input-align="right" />
         </van-cell-group>
       </van-form>
     </div>
@@ -306,7 +1236,7 @@
     <div class="map" :class="mapStatus === 'retract' ? 'retract1' : ''"
       :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden' }">
       <a-map ref="mapRef" :class="mapStatus === 'retract' ? 'retract2' : ''" style="width: 100%;height: 100%;"
-        :zoom="15" />
+        @complete="completeMap" :zoom="15" />
       <!-- 重置按钮 -->
       <div v-if="mapStatus === 'expand'" class="reset-icon" @click="resetMap">
         <div class="icon"></div>
@@ -321,8 +1251,8 @@
     </div>
     <!-- 按钮 -->
     <div id="handler-btn" class="btn-container">
-      <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-      <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+      <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+      <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
     </div>
   </div>
 </template>
@@ -333,6 +1263,12 @@
   margin-left: 10px;
 }
 
+.radio {
+  margin-left: 5px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
 .del_d {
   position: absolute;
   width: 16px;
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
new file mode 100644
index 0000000..125eb71
--- /dev/null
+++ b/src/views/mobile/device/success.vue
@@ -0,0 +1,310 @@
+<!--
+  Description: 新装设备-保存成功
+  Author: 李亚光
+  Date: 2025-02-24
+ -->
+<script lang="ts" setup name="H5DeviceAddSuccess">
+import AMap from '@/components/map/index.vue'
+const $route = useRoute()
+const detailInfo = ref<any>({})
+detailInfo.value = JSON.parse($route.query.row as string)
+// 返回首页
+const $router = useRouter()
+const backHome = () => {
+  $router.replace({
+    name: 'Home'
+  })
+}
+// 计算地图区域高度
+const scrollHeight = ref(0)
+const calcHeight = () => {
+  // 公共头部高度40
+  // 边距安全 30
+  // 底部按钮
+  const exportBtnHeight = document.getElementById('export-btn')?.offsetHeight || 0
+  // 头部
+  const searchHeaderHeight = document.getElementById('base-info')?.offsetHeight || 0
+  const headerHeight = document.getElementById('header')?.offsetHeight || 0
+  scrollHeight.value = window.innerHeight - 40 - exportBtnHeight - searchHeaderHeight - 30 - headerHeight - 15
+  console.log('scrollHeight', scrollHeight.value)
+}
+window.addEventListener('resize', () => {
+  calcHeight()
+})
+function resizePage() {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 200)
+}
+const showMap = ref(false)
+onMounted(() => {
+  calcHeight()
+  resizePage()
+  setTimeout(() => {
+    showMap.value = true
+  }, 500);
+})
+const mapRef = ref()
+const completeMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  mapRef.value.addMarker({
+    position: [detailInfo.value.lng, detailInfo.value.lat],
+    content: '',
+    label: '',
+  })
+  resizePage()
+}
+const resetMap = () => {
+  mapRef.value.map.setCenter([detailInfo.value.lng, detailInfo.value.lat])
+  mapRef.value.map.setZoom(16)
+  resizePage()
+}
+// 继续新装设备
+const addDevice = () => {
+  $router.replace({
+    name: 'DeviceAdd'
+  })
+}
+</script>
+
+<template>
+  <div class="container">
+    <div id="header" class="header">
+      <div class="icon"></div>
+      <div class="tips">设备信息添加成功</div>
+    </div>
+    <div class="info-container">
+      <!-- 基本信息 -->
+      <div id="base-info" class="search-info">
+        <div class="cell">
+          <div class="title">产品</div>
+          <!-- <div class="value">{{ detailInfo.productName }}</div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.productName" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">设备编号</div>
+          <div class="value">{{ detailInfo.devcode }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">安装位置</div>
+          <div class="value">{{ detailInfo.tagNumber }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">详细位置</div>
+          <!-- <div class="value">{{ detailInfo.position }}
+          </div> -->
+          <div class="value"><van-text-ellipsis :rows="1" :content="detailInfo.position" expand-text="展开"
+              collapse-text="收起" />
+          </div>
+        </div>
+        <div class="cell">
+          <div class="title">安装日期</div>
+          <div class="value">{{ detailInfo.installDate }}</div>
+        </div>
+        <div class="cell">
+          <div class="title">操作人</div>
+          <div class="value">{{ detailInfo.userName }}</div>
+        </div>
+      </div>
+      <div class="map"
+        :style="{ width: '96%', margin: '0 auto', height: scrollHeight + 'px', marginTop: '5px', borderRadius: '10px', overflow: 'hidden', position: 'relative' }">
+        <a-map v-if="showMap" ref="mapRef" style="width: 100%;height: 100%;" @complete="completeMap" :zoom="15" />
+        <div class="reset-icon" @click="resetMap">
+          <div class="icon"></div>
+        </div>
+      </div>
+    </div>
+    <div id="export-btn" class="export-btn">
+      <el-button type="primary" style="width: 48%;" @click="backHome">返回首页</el-button>
+      <el-button type="primary" style="width: 48%;" @click="addDevice">继续新装</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
+
+  .icon {
+    background: url("@/assets/images/success.png") no-repeat center center / cover;
+    width: 45px;
+    height: 45px;
+  }
+
+  .tips {
+    font-size: 20px;
+    font-weight: 400;
+    margin-left: 10px;
+  }
+}
+
+.reset-icon {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  z-index: 2;
+  bottom: 10px;
+  right: 16px;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+  background-color: #fff;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+    background: url('@/assets/icons/icon-location_current.svg') no-repeat center center / cover;
+  }
+}
+
+.info-container {
+  width: 100%;
+  height: calc(100vh - 40px);
+  overflow: hidden;
+  color: #444;
+
+  .search-info {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    padding-left: 0.8rem;
+    font-size: 1.1rem;
+
+    .cell {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 6px;
+      padding-bottom: 6px;
+      padding-right: 14px;
+      align-items: center;
+
+      .value {
+        color: #888;
+        width: 80%;
+        text-align: right;
+        font-size: 1rem;
+        vertical-align: middle;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: center;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .location {
+          display: inline-block;
+          width: 22px;
+          height: 22px;
+          background: url('@/assets/icons/icon-location.svg') no-repeat center center / cover;
+          vertical-align: middle;
+          margin-left: 8px;
+        }
+      }
+
+      .title {
+        width: 20%;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      // .title,
+      // .value {
+      //   white-space: nowrap;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+    }
+  }
+
+  .search-result {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    margin-top: 1vh;
+    border-radius: 6px;
+    padding: 4px;
+    padding-left: 0.6rem;
+
+    .title {
+      display: flex;
+      font-size: 1.1rem;
+
+      .symbol {
+        width: 4px;
+        height: 22px;
+        background-color: #0d76d4;
+        border-radius: 4px;
+        margin-right: 8px;
+      }
+    }
+
+    .top-border {
+      border-top: 1px solid #e4e7ed;
+      // margin-top: 8px;
+    }
+
+    .result-item {
+      .cell {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        padding-right: 18px;
+        align-items: center;
+
+        .value {
+          color: #888;
+          width: 80%;
+          text-align: right;
+          font-size: 1rem;
+          vertical-align: middle;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: center;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+        }
+
+        .title {
+          width: 20%;
+          white-space: nowrap;
+        }
+      }
+    }
+
+  }
+}
+
+.export-btn {
+  position: absolute;
+  width: 96%;
+  bottom: 1vh;
+  display: flex;
+  justify-content: space-around;
+  // margin: 0 auto;
+  left: 50%;
+  transform: translateX(-50%);
+
+
+  ::v-deep(.el-button) {
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue
index 814808c..91c0ec5 100644
--- a/src/views/mobile/operation/index.vue
+++ b/src/views/mobile/operation/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="H5DeviceOperation">
 import { keepSearchParams } from '@/utils/keepQuery'
 import dayjs from 'dayjs'
-import { showToast, showImagePreview } from 'vant'
+import { showToast, showImagePreview, showLoadingToast, closeToast } from 'vant'
 import { getDictByCode } from '@/api/system/dict'
 import { addDeviceInstall, getDeviceInstall, uploadApi } from '@/api/mobile/operation'
 import useUserStore from '@/store/modules/user'
@@ -107,12 +107,20 @@
   if (event.target.files?.length !== 0) {
     const file = event.target.files[0]
     const fd = new FormData()
+    showLoadingToast({
+      duration: 0,
+      message: '加载中...',
+      forbidClick: true,
+      loadingType: 'spinner',
+    })
     fd.append('file', file)
     uploadApi(fd).then(res => {
       baseInfo.value.photo.push(res.data as string)
       fileRef.value.value = ''
+      closeToast()
     }).catch(() => {
       fileRef.value.value = ''
+      closeToast()
     })
 
     // const reader = new FileReader() // 实例化FileReader
@@ -231,7 +239,7 @@
 </script>
 
 <template>
-  <div class="device-container">
+  <div v-loading="loading" class="device-container">
     <!-- 设备信息 -->
     <div class="device-info">
       <van-form ref="formRef">
@@ -291,8 +299,8 @@
   </div>
   <!-- 按钮 -->
   <div class="btn-container">
-    <el-button type="primary" style="width: 48%;" @click="save">保存</el-button>
-    <el-button type="primary" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
+    <el-button type="primary" :disabled="loading" style="width: 48%;" @click="save">保存</el-button>
+    <el-button type="primary" :disabled="loading" plain style="width: 48%;" @click="deviceData">查看设备数据</el-button>
   </div>
 </template>
 
diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue
index e341271..7ba4c81 100644
--- a/src/views/mobile/record/detail.vue
+++ b/src/views/mobile/record/detail.vue
@@ -45,7 +45,7 @@
 // 预览图片
 const previewPhoto = (index: number) => {
   showImagePreview({
-    images: imagesList.value,
+    images: imagesList.value.map((item: any) => getPhotoUrl.value(item)),
     startPosition: index
   })
 }
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 2237efd..3db649a 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delErrorLog,
@@ -36,7 +37,10 @@
     listQuery.offset = 1
   }
   getErrorLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index a13655d..c96694b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -2,6 +2,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 import type { IlistQuery } from './log-interface'
 import {
   delLog,
@@ -56,7 +57,10 @@
     listQuery.offset = 1
   }
   getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index b1cb93d..d069d7e 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -4,7 +4,7 @@
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
-
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 const { proxy } = getCurrentInstance() as any
 const listQuery: IlistQuery = reactive({
   keywords: '',
@@ -53,7 +53,10 @@
     listQuery.offset = 1
   }
   getLoginLogList(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item) => ({
+      ...item,
+      userName: isEncrypt(item.userName) ? decrypt(item.userName) : item.userName,
+    }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 2062f97..c6433a7 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -6,10 +6,11 @@
 import AddUser from './userAdd.vue'
 import RoleAssignment from './roleAssignment.vue'
 import { getDeptTreeList } from '@/api/system/dept'
-import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser } from '@/api/system/user'
+import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser, updateUser } from '@/api/system/user'
 import { toTreeList } from '@/utils/structure'
 import { RSAencrypt } from '@/utils/security'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { encrypt, decrypt, isEncrypt } from '@/utils/security1'
 // 逻辑代码
 interface Tree {
   name: string
@@ -55,10 +56,31 @@
 const fetchData = (flag: string) => {
   loadingTable.value = true
   select.value = ''
-  getUserList(listQuery).then((res) => {
-    list.value = res.data.rows
+  getUserList({
+    ...listQuery,
+    keywords: /^[A-Za-z]+$/.test(listQuery.keywords) ? listQuery.keywords : encrypt(listQuery.keywords)
+  }).then((res) => {
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      name: isEncrypt(item.name) ? decrypt(item.name) : item.name,
+      phone: isEncrypt(item.phone) ? decrypt(item.phone) : item.phone,
+      email: isEncrypt(item.email) ? decrypt(item.email) : item.email,
+    }))
     total.value = res.data.total
     loadingTable.value = false
+
+    // list.value.forEach((item: any) => {
+    //   if (!isEncrypt(item.name) && !isEncrypt(item.phone) && !isEncrypt(item.email)) {
+    //     updateUser({
+    //       ...item,
+    //       name: encrypt(item.name),
+    //       phone: encrypt(item.phone),
+    //       email: encrypt(item.email)
+    //     }).then(res => {
+    //       console.log('更新成功')
+    //     })
+    //   }
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -124,6 +146,33 @@
     ElMessage.error('必须选中一项')
   }
 }
+// 批量加密
+// const index = ref(0)
+// const batchEncrypt = () => {
+//   if (total.value === 0) {
+//     ElMessage.warning('暂无用户')
+//     return
+//   }
+//   for (let i = index.value * 20; i < ((index.value + 1) * 20); i++) {
+//     getUserList({ offset: i, limit: 1 }).then(res => {
+//       if (res.data.rows.length) {
+//         const data = res.data.rows[0]
+//         if (!isEncrypt(data.name) && !isEncrypt(data.phone) && !isEncrypt(data.email)) {
+//           updateUser({
+//             ...data,
+//             name: encrypt(data.name),
+//             phone: encrypt(data.phone),
+//             email: encrypt(data.email)
+//           }).then(res => {
+//             console.log('更新成功')
+//           })
+//         }
+//       }
+//     })
+//   }
+//   index.value += 1
+
+// }
 // 删除用户
 const deleteUser = () => {
   if (select.value) {
@@ -221,10 +270,8 @@
               </div>
             </template>
             <el-scrollbar height="100%" class="user-dept-scroll">
-              <el-tree
-                v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
-                :expand-on-click-node="false" @node-click="handleNodeClick"
-              />
+              <el-tree v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+                :expand-on-click-node="false" @node-click="handleNodeClick" />
             </el-scrollbar>
           </el-card>
         </div>
@@ -237,16 +284,12 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
           <search-item>
-            <el-date-picker
-              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间"
-            />
+            <el-date-picker v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" />
           </search-item>
           <search-item>
-            <el-date-picker
-              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择结束时间"
-            />
+            <el-date-picker v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" />
           </search-item>
         </search-area>
         <!-- 表头标题 -->
@@ -254,6 +297,10 @@
           <template #btns-left>
             <!-- 操作 -->
             <div>
+              <!-- v-if="proxy.hasPerm('/sys/mgr/batch')" -->
+              <!-- <el-button type="primary" @click="batchEncrypt">
+                批量加密
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/sys/mgr/add')" type="primary" :icon="Plus" @click="add">
                 新增
               </el-button>
@@ -266,19 +313,15 @@
               <el-button v-if="proxy.hasPerm('/sys/mgr/reset')" type="primary" :icon="Key" @click="resetPwd">
                 重置密码
               </el-button>
-              <el-button
-                v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
-                @click="assignmentRole"
-              >
+              <el-button v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
+                @click="assignmentRole">
                 角色分配
               </el-button>
             </div>
           </template>
           <!-- 查询结果Table显示 -->
-          <normal-table
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loadingTable" @change="changePage"
-          >
+          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+            @change="changePage">
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
@@ -301,7 +344,8 @@
               </el-table-column>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button :type="(btnStatus as any)[scope.row.statusName]" link size="small" @click="frozenUser(scope.row)">
+                  <el-button :type="(btnStatus as any)[scope.row.statusName]" link size="small"
+                    @click="frozenUser(scope.row)">
                     {{ (btnNames as any)[scope.row.statusName] }}
                   </el-button>
                 </template>
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index a25c989..927d103 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -10,6 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { RSAencrypt } from '@/utils/security'
+import { encrypt , decrypt } from '@/utils/security1'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
 const dialogFormVisible = ref<boolean>(false)// 对话框是否显示
@@ -118,7 +119,12 @@
     userForm1.rePassword = await RSAencrypt(userForm1.rePassword)
     if (valid) {
       btnLoading.value = true
-      addUser(userForm1).then((response) => {
+      addUser({
+        ...userForm1,
+        name: encrypt(userForm1.name),
+        email: encrypt(userForm1.email),
+        phone: encrypt(userForm1.phone),
+      }).then((response) => {
         ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
           confirmButtonText: '是',
           cancelButtonText: '否',
@@ -144,7 +150,13 @@
   ruleFormRef.value?.validate((valid) => {
     if (valid) {
       btnLoading.value = true
-      updateUser(userForm).then((response) => {
+      updateUser({
+        ...userForm,
+        // account: encrypt(userForm.account),
+        name: encrypt(userForm.name),
+        email: encrypt(userForm.email),
+        phone: encrypt(userForm.phone),
+      }).then((response) => {
         ElMessage.success('修改成功')
         dialogFormVisible.value = false
         emits('resetData')
diff --git a/vite/plugins/html.ts b/vite/plugins/html.ts
index a039d0a..4bb9507 100644
--- a/vite/plugins/html.ts
+++ b/vite/plugins/html.ts
@@ -1,5 +1,4 @@
 import { createHtmlPlugin } from 'vite-plugin-html'
-
 export default function createHtml(env, isBuild) {
   const { VITE_APP_TITLE, VITE_APP_DEBUG_TOOL } = env
   let copyrightScript = ''