diff --git a/src/api/pop.js b/src/api/pop.js
index a4a4a9e..bfc147d 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -146,7 +146,7 @@
 // 设备离线率
 export function offlineRate() {
   return request({
-    url: 'device/offlineRate',
+    url: 'cockpit/device/offlineRate',
     method: 'get'
   })
 }

diff --git a/src/api/pop.js b/src/api/pop.js
index a4a4a9e..bfc147d 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -146,7 +146,7 @@
 // 设备离线率
 export function offlineRate() {
   return request({
-    url: 'device/offlineRate',
+    url: 'cockpit/device/offlineRate',
     method: 'get'
   })
 }
diff --git a/src/views/popup/board.vue b/src/views/popup/board.vue
index 85554f4..9770b3f 100644
--- a/src/views/popup/board.vue
+++ b/src/views/popup/board.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20" style="position:relative">
-        <el-col :span="12">
+        <el-col :span="10">
           <el-form-item label="监控点位" prop="point">
             <moreSelect ref="moreSelect" placeholder="默认全部监控点位，可选择" :options="resourceTreeList" :props="defaultProps" multiple :value-multiple="point" @getValue="getSelectedValue" />
             <!-- <select-tree v-model="point" ref="selectTree" multiple placeholder="请输入摄像头监控点位" input-size="small" :options="resourceTreeList" :props="defaultProps" /> -->
@@ -58,13 +58,16 @@
             <el-input v-model="listQuery.minSimilarity" size="small" placeholder="区间1-100" />
           </el-form-item>
         </el-col>
-        <el-col :span="6" style="margin-top:4px;display:flex;justify-content: end;padding-right: 25px;">
-          <el-button type="primary" size="small" style="margin-right:20px" @click="search">
+        <el-col :span="8" style="margin-top:4px;display:flex;justify-content: end;">
+          <el-button type="primary" size="small" style="margin-right:10px" @click="search">
             查询
           </el-button>
-          <el-button type="danger" size="small" style="margin-right:20px" @click="clearInput">
+          <el-button type="danger" size="small" style="margin-right:10px" @click="clearInput">
             重置
           </el-button>
+          <el-button type="primary" size="small" style="margin-right:10px" @click="onwall">
+            驾驶舱轨迹上图
+          </el-button>
         </el-col>
       </el-row>
     </el-form>
@@ -101,6 +104,8 @@
 import { getDate } from '@/utils/calendarUtil'
 // import SelectTree from '@/components/SelectTree/singleSelect'
 import moreSelect from './components/selectTree'
+import {repostSocket} from "@/api/common";
+
 export default {
   name: 'TrailDialog',
   components: { moreSelect },
@@ -162,6 +167,7 @@
         label: 'devName'
       },
       list: [],
+      wallList: '',
       rules: {
         cameraIndexCodes: [
           { required: true, message: '请填写监控点位', trigger: 'blur' }
@@ -245,7 +251,7 @@
     fetchData() {
       hikPic(this.listQuery).then(response => {
         if (response.code === 200) {
-          // this.list = response.data
+          this.wallList = response.data.toString()
           this.list = this.handleListOrder(response.data)
         }
       })
@@ -262,6 +268,21 @@
       this.listQuery.minSimilarity = ''
       this.timeRange = [getDate(0, 'DATE') + ' 00:00:00', getDate(0, 'SECOND')]
     },
+    // 轨迹上墙
+    onwall() {
+      if (this.list.length === 0) {
+        this.$message.warning('无记录上图，请重新搜索!')
+        return
+      }
+      const params = {
+        type: 'onwall-' + this.listQuery.personName,
+        message: this.wallList
+      }
+      repostSocket(params).then(response => {
+        if (response.code === 200) {
+        }
+      })
+    },
     // 搜索
     search() {
       if (this.listQuery.minSimilarity >= 1 && this.listQuery.minSimilarity <= 100) {

diff --git a/src/api/pop.js b/src/api/pop.js
index a4a4a9e..bfc147d 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -146,7 +146,7 @@
 // 设备离线率
 export function offlineRate() {
   return request({
-    url: 'device/offlineRate',
+    url: 'cockpit/device/offlineRate',
     method: 'get'
   })
 }
diff --git a/src/views/popup/board.vue b/src/views/popup/board.vue
index 85554f4..9770b3f 100644
--- a/src/views/popup/board.vue
+++ b/src/views/popup/board.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20" style="position:relative">
-        <el-col :span="12">
+        <el-col :span="10">
           <el-form-item label="监控点位" prop="point">
             <moreSelect ref="moreSelect" placeholder="默认全部监控点位，可选择" :options="resourceTreeList" :props="defaultProps" multiple :value-multiple="point" @getValue="getSelectedValue" />
             <!-- <select-tree v-model="point" ref="selectTree" multiple placeholder="请输入摄像头监控点位" input-size="small" :options="resourceTreeList" :props="defaultProps" /> -->
@@ -58,13 +58,16 @@
             <el-input v-model="listQuery.minSimilarity" size="small" placeholder="区间1-100" />
           </el-form-item>
         </el-col>
-        <el-col :span="6" style="margin-top:4px;display:flex;justify-content: end;padding-right: 25px;">
-          <el-button type="primary" size="small" style="margin-right:20px" @click="search">
+        <el-col :span="8" style="margin-top:4px;display:flex;justify-content: end;">
+          <el-button type="primary" size="small" style="margin-right:10px" @click="search">
             查询
           </el-button>
-          <el-button type="danger" size="small" style="margin-right:20px" @click="clearInput">
+          <el-button type="danger" size="small" style="margin-right:10px" @click="clearInput">
             重置
           </el-button>
+          <el-button type="primary" size="small" style="margin-right:10px" @click="onwall">
+            驾驶舱轨迹上图
+          </el-button>
         </el-col>
       </el-row>
     </el-form>
@@ -101,6 +104,8 @@
 import { getDate } from '@/utils/calendarUtil'
 // import SelectTree from '@/components/SelectTree/singleSelect'
 import moreSelect from './components/selectTree'
+import {repostSocket} from "@/api/common";
+
 export default {
   name: 'TrailDialog',
   components: { moreSelect },
@@ -162,6 +167,7 @@
         label: 'devName'
       },
       list: [],
+      wallList: '',
       rules: {
         cameraIndexCodes: [
           { required: true, message: '请填写监控点位', trigger: 'blur' }
@@ -245,7 +251,7 @@
     fetchData() {
       hikPic(this.listQuery).then(response => {
         if (response.code === 200) {
-          // this.list = response.data
+          this.wallList = response.data.toString()
           this.list = this.handleListOrder(response.data)
         }
       })
@@ -262,6 +268,21 @@
       this.listQuery.minSimilarity = ''
       this.timeRange = [getDate(0, 'DATE') + ' 00:00:00', getDate(0, 'SECOND')]
     },
+    // 轨迹上墙
+    onwall() {
+      if (this.list.length === 0) {
+        this.$message.warning('无记录上图，请重新搜索!')
+        return
+      }
+      const params = {
+        type: 'onwall-' + this.listQuery.personName,
+        message: this.wallList
+      }
+      repostSocket(params).then(response => {
+        if (response.code === 200) {
+        }
+      })
+    },
     // 搜索
     search() {
       if (this.listQuery.minSimilarity >= 1 && this.listQuery.minSimilarity <= 100) {
diff --git a/src/views/popup/components/personTable.vue b/src/views/popup/components/personTable.vue
index 8c01a08..4a8919a 100644
--- a/src/views/popup/components/personTable.vue
+++ b/src/views/popup/components/personTable.vue
@@ -25,8 +25,9 @@
 </template>
 <script>
 
-import { getStaffList } from '@/api/person'
+import { getStaffListPage, hikPic } from '@/api/person'
 import { repostSocket } from '@/api/common';
+import { getDate } from '@/utils/calendarUtil'
 
 export default {
   name: 'PersonTable',
@@ -38,6 +39,7 @@
       showFlag: true,
       tableTimer: null,
       tableTop: 0,
+      wallList: '',
       tableList: [],
       tableListSize: 0,
       componentTimer: null,
@@ -68,8 +70,28 @@
   methods: {
     JumpDevice(item) {
       const params = {
-        type: 'force',
-        message: item.drawNo
+        facePicUrl: item.picture, // 图片url
+        startTime: getDate(-31, 'SECOND'), // 开始时间
+        endTime: getDate(0, 'SECOND'), // 结束时间
+        minSimilarity: '50' // 相似度
+      }
+      hikPic(params).then(response => {
+        if (response.code === 200) {
+          this.wallList = response.data.toString()
+          if (response.data.length === 0) {
+            this.$message.warning('该人员近一个月无记录!')
+            return
+          } else {
+            this.onwall(item)
+          }
+        }
+      })
+    },
+    // 轨迹上墙
+    onwall(item) {
+      const params = {
+        type: 'onwall-' + this.listQuery.staffName,
+        message: this.wallList
       }
       repostSocket(params).then(response => {
         if (response.code === 200) {
@@ -78,11 +100,16 @@
     },
     fetchData() {
       const params = {
-        staffType: '2'
+        staffType: '2',
+        offset: 1,
+        limit: 50,
+        keywords: '',
+        cardNum: '',
+        phone: ''
       }
-      getStaffList({}).then(response => {
+      getStaffListPage(params).then(response => {
         if (response.code === 200) {
-          this.tableList = response.data
+          this.tableList = response.data.rows
           this.tableActionFun()
         }
       })

diff --git a/src/api/pop.js b/src/api/pop.js
index a4a4a9e..bfc147d 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -146,7 +146,7 @@
 // 设备离线率
 export function offlineRate() {
   return request({
-    url: 'device/offlineRate',
+    url: 'cockpit/device/offlineRate',
     method: 'get'
   })
 }
diff --git a/src/views/popup/board.vue b/src/views/popup/board.vue
index 85554f4..9770b3f 100644
--- a/src/views/popup/board.vue
+++ b/src/views/popup/board.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20" style="position:relative">
-        <el-col :span="12">
+        <el-col :span="10">
           <el-form-item label="监控点位" prop="point">
             <moreSelect ref="moreSelect" placeholder="默认全部监控点位，可选择" :options="resourceTreeList" :props="defaultProps" multiple :value-multiple="point" @getValue="getSelectedValue" />
             <!-- <select-tree v-model="point" ref="selectTree" multiple placeholder="请输入摄像头监控点位" input-size="small" :options="resourceTreeList" :props="defaultProps" /> -->
@@ -58,13 +58,16 @@
             <el-input v-model="listQuery.minSimilarity" size="small" placeholder="区间1-100" />
           </el-form-item>
         </el-col>
-        <el-col :span="6" style="margin-top:4px;display:flex;justify-content: end;padding-right: 25px;">
-          <el-button type="primary" size="small" style="margin-right:20px" @click="search">
+        <el-col :span="8" style="margin-top:4px;display:flex;justify-content: end;">
+          <el-button type="primary" size="small" style="margin-right:10px" @click="search">
             查询
           </el-button>
-          <el-button type="danger" size="small" style="margin-right:20px" @click="clearInput">
+          <el-button type="danger" size="small" style="margin-right:10px" @click="clearInput">
             重置
           </el-button>
+          <el-button type="primary" size="small" style="margin-right:10px" @click="onwall">
+            驾驶舱轨迹上图
+          </el-button>
         </el-col>
       </el-row>
     </el-form>
@@ -101,6 +104,8 @@
 import { getDate } from '@/utils/calendarUtil'
 // import SelectTree from '@/components/SelectTree/singleSelect'
 import moreSelect from './components/selectTree'
+import {repostSocket} from "@/api/common";
+
 export default {
   name: 'TrailDialog',
   components: { moreSelect },
@@ -162,6 +167,7 @@
         label: 'devName'
       },
       list: [],
+      wallList: '',
       rules: {
         cameraIndexCodes: [
           { required: true, message: '请填写监控点位', trigger: 'blur' }
@@ -245,7 +251,7 @@
     fetchData() {
       hikPic(this.listQuery).then(response => {
         if (response.code === 200) {
-          // this.list = response.data
+          this.wallList = response.data.toString()
           this.list = this.handleListOrder(response.data)
         }
       })
@@ -262,6 +268,21 @@
       this.listQuery.minSimilarity = ''
       this.timeRange = [getDate(0, 'DATE') + ' 00:00:00', getDate(0, 'SECOND')]
     },
+    // 轨迹上墙
+    onwall() {
+      if (this.list.length === 0) {
+        this.$message.warning('无记录上图，请重新搜索!')
+        return
+      }
+      const params = {
+        type: 'onwall-' + this.listQuery.personName,
+        message: this.wallList
+      }
+      repostSocket(params).then(response => {
+        if (response.code === 200) {
+        }
+      })
+    },
     // 搜索
     search() {
       if (this.listQuery.minSimilarity >= 1 && this.listQuery.minSimilarity <= 100) {
diff --git a/src/views/popup/components/personTable.vue b/src/views/popup/components/personTable.vue
index 8c01a08..4a8919a 100644
--- a/src/views/popup/components/personTable.vue
+++ b/src/views/popup/components/personTable.vue
@@ -25,8 +25,9 @@
 </template>
 <script>
 
-import { getStaffList } from '@/api/person'
+import { getStaffListPage, hikPic } from '@/api/person'
 import { repostSocket } from '@/api/common';
+import { getDate } from '@/utils/calendarUtil'
 
 export default {
   name: 'PersonTable',
@@ -38,6 +39,7 @@
       showFlag: true,
       tableTimer: null,
       tableTop: 0,
+      wallList: '',
       tableList: [],
       tableListSize: 0,
       componentTimer: null,
@@ -68,8 +70,28 @@
   methods: {
     JumpDevice(item) {
       const params = {
-        type: 'force',
-        message: item.drawNo
+        facePicUrl: item.picture, // 图片url
+        startTime: getDate(-31, 'SECOND'), // 开始时间
+        endTime: getDate(0, 'SECOND'), // 结束时间
+        minSimilarity: '50' // 相似度
+      }
+      hikPic(params).then(response => {
+        if (response.code === 200) {
+          this.wallList = response.data.toString()
+          if (response.data.length === 0) {
+            this.$message.warning('该人员近一个月无记录!')
+            return
+          } else {
+            this.onwall(item)
+          }
+        }
+      })
+    },
+    // 轨迹上墙
+    onwall(item) {
+      const params = {
+        type: 'onwall-' + this.listQuery.staffName,
+        message: this.wallList
       }
       repostSocket(params).then(response => {
         if (response.code === 200) {
@@ -78,11 +100,16 @@
     },
     fetchData() {
       const params = {
-        staffType: '2'
+        staffType: '2',
+        offset: 1,
+        limit: 50,
+        keywords: '',
+        cardNum: '',
+        phone: ''
       }
-      getStaffList({}).then(response => {
+      getStaffListPage(params).then(response => {
         if (response.code === 200) {
-          this.tableList = response.data
+          this.tableList = response.data.rows
           this.tableActionFun()
         }
       })
diff --git a/src/views/popup/left.vue b/src/views/popup/left.vue
index 64a2799..bb37a71 100644
--- a/src/views/popup/left.vue
+++ b/src/views/popup/left.vue
@@ -29,7 +29,7 @@
       <div class="item">
         <el-image :src="require('@/assets/popup/离线.png')" class="base-map-image" mode="fill" />
         <div style="color: #B3F3F6;text-shadow: 0 0 2px #d1ffff;">设备离线率</div>
-        <div class="num">{{list["5"]}}<span class="unit">%</span></div>
+        <div class="num">{{list["5"]}}<span class="unit"></span></div>
       </div>
     </div>
     <div class="block" style="flex-direction: column;">

diff --git a/src/api/pop.js b/src/api/pop.js
index a4a4a9e..bfc147d 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -146,7 +146,7 @@
 // 设备离线率
 export function offlineRate() {
   return request({
-    url: 'device/offlineRate',
+    url: 'cockpit/device/offlineRate',
     method: 'get'
   })
 }
diff --git a/src/views/popup/board.vue b/src/views/popup/board.vue
index 85554f4..9770b3f 100644
--- a/src/views/popup/board.vue
+++ b/src/views/popup/board.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20" style="position:relative">
-        <el-col :span="12">
+        <el-col :span="10">
           <el-form-item label="监控点位" prop="point">
             <moreSelect ref="moreSelect" placeholder="默认全部监控点位，可选择" :options="resourceTreeList" :props="defaultProps" multiple :value-multiple="point" @getValue="getSelectedValue" />
             <!-- <select-tree v-model="point" ref="selectTree" multiple placeholder="请输入摄像头监控点位" input-size="small" :options="resourceTreeList" :props="defaultProps" /> -->
@@ -58,13 +58,16 @@
             <el-input v-model="listQuery.minSimilarity" size="small" placeholder="区间1-100" />
           </el-form-item>
         </el-col>
-        <el-col :span="6" style="margin-top:4px;display:flex;justify-content: end;padding-right: 25px;">
-          <el-button type="primary" size="small" style="margin-right:20px" @click="search">
+        <el-col :span="8" style="margin-top:4px;display:flex;justify-content: end;">
+          <el-button type="primary" size="small" style="margin-right:10px" @click="search">
             查询
           </el-button>
-          <el-button type="danger" size="small" style="margin-right:20px" @click="clearInput">
+          <el-button type="danger" size="small" style="margin-right:10px" @click="clearInput">
             重置
           </el-button>
+          <el-button type="primary" size="small" style="margin-right:10px" @click="onwall">
+            驾驶舱轨迹上图
+          </el-button>
         </el-col>
       </el-row>
     </el-form>
@@ -101,6 +104,8 @@
 import { getDate } from '@/utils/calendarUtil'
 // import SelectTree from '@/components/SelectTree/singleSelect'
 import moreSelect from './components/selectTree'
+import {repostSocket} from "@/api/common";
+
 export default {
   name: 'TrailDialog',
   components: { moreSelect },
@@ -162,6 +167,7 @@
         label: 'devName'
       },
       list: [],
+      wallList: '',
       rules: {
         cameraIndexCodes: [
           { required: true, message: '请填写监控点位', trigger: 'blur' }
@@ -245,7 +251,7 @@
     fetchData() {
       hikPic(this.listQuery).then(response => {
         if (response.code === 200) {
-          // this.list = response.data
+          this.wallList = response.data.toString()
           this.list = this.handleListOrder(response.data)
         }
       })
@@ -262,6 +268,21 @@
       this.listQuery.minSimilarity = ''
       this.timeRange = [getDate(0, 'DATE') + ' 00:00:00', getDate(0, 'SECOND')]
     },
+    // 轨迹上墙
+    onwall() {
+      if (this.list.length === 0) {
+        this.$message.warning('无记录上图，请重新搜索!')
+        return
+      }
+      const params = {
+        type: 'onwall-' + this.listQuery.personName,
+        message: this.wallList
+      }
+      repostSocket(params).then(response => {
+        if (response.code === 200) {
+        }
+      })
+    },
     // 搜索
     search() {
       if (this.listQuery.minSimilarity >= 1 && this.listQuery.minSimilarity <= 100) {
diff --git a/src/views/popup/components/personTable.vue b/src/views/popup/components/personTable.vue
index 8c01a08..4a8919a 100644
--- a/src/views/popup/components/personTable.vue
+++ b/src/views/popup/components/personTable.vue
@@ -25,8 +25,9 @@
 </template>
 <script>
 
-import { getStaffList } from '@/api/person'
+import { getStaffListPage, hikPic } from '@/api/person'
 import { repostSocket } from '@/api/common';
+import { getDate } from '@/utils/calendarUtil'
 
 export default {
   name: 'PersonTable',
@@ -38,6 +39,7 @@
       showFlag: true,
       tableTimer: null,
       tableTop: 0,
+      wallList: '',
       tableList: [],
       tableListSize: 0,
       componentTimer: null,
@@ -68,8 +70,28 @@
   methods: {
     JumpDevice(item) {
       const params = {
-        type: 'force',
-        message: item.drawNo
+        facePicUrl: item.picture, // 图片url
+        startTime: getDate(-31, 'SECOND'), // 开始时间
+        endTime: getDate(0, 'SECOND'), // 结束时间
+        minSimilarity: '50' // 相似度
+      }
+      hikPic(params).then(response => {
+        if (response.code === 200) {
+          this.wallList = response.data.toString()
+          if (response.data.length === 0) {
+            this.$message.warning('该人员近一个月无记录!')
+            return
+          } else {
+            this.onwall(item)
+          }
+        }
+      })
+    },
+    // 轨迹上墙
+    onwall(item) {
+      const params = {
+        type: 'onwall-' + this.listQuery.staffName,
+        message: this.wallList
       }
       repostSocket(params).then(response => {
         if (response.code === 200) {
@@ -78,11 +100,16 @@
     },
     fetchData() {
       const params = {
-        staffType: '2'
+        staffType: '2',
+        offset: 1,
+        limit: 50,
+        keywords: '',
+        cardNum: '',
+        phone: ''
       }
-      getStaffList({}).then(response => {
+      getStaffListPage(params).then(response => {
         if (response.code === 200) {
-          this.tableList = response.data
+          this.tableList = response.data.rows
           this.tableActionFun()
         }
       })
diff --git a/src/views/popup/left.vue b/src/views/popup/left.vue
index 64a2799..bb37a71 100644
--- a/src/views/popup/left.vue
+++ b/src/views/popup/left.vue
@@ -29,7 +29,7 @@
       <div class="item">
         <el-image :src="require('@/assets/popup/离线.png')" class="base-map-image" mode="fill" />
         <div style="color: #B3F3F6;text-shadow: 0 0 2px #d1ffff;">设备离线率</div>
-        <div class="num">{{list["5"]}}<span class="unit">%</span></div>
+        <div class="num">{{list["5"]}}<span class="unit"></span></div>
       </div>
     </div>
     <div class="block" style="flex-direction: column;">
diff --git a/src/views/popup/right.vue b/src/views/popup/right.vue
index cd197b3..c55ac08 100644
--- a/src/views/popup/right.vue
+++ b/src/views/popup/right.vue
@@ -87,11 +87,11 @@
           trigger: 'item'
         },
         legend: {
-          bottom: 0,
+          right: 20,
+          top: 10,
           data: ['事件频次'],
           itemStyle: {
-            color: 'rgb(12,228,235)',
-            shadowColor: 'white'
+            color: '#d5f6fa'
           },
           textStyle: {
             color: '#cce9ff',
@@ -103,6 +103,7 @@
           indicator: that.safeData.map((item) => {
             return { text: item.categoryLevelName, max: that.safeData[0].quantity * 1.2 }
           }),
+          center: ['50%', '55%'],
           splitArea: {
             areaStyle: {
               color: ['#77EADF99', '#26C3BE99', '#64AFE999', '#428BD499'],
@@ -111,7 +112,7 @@
             }
           },
           name: {
-            color: 'white',
+            color: '#d5f6fa',
             fontWeight: 'bold',
             fontSize: 14
           }
@@ -125,11 +126,29 @@
             color: 'rgb(12,228,235)'
           },
           areaStyle: {
-            color: 'rgb(8,91,121,0.5)'
+            color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
+              {
+                color: 'rgb(8,91,121,0.8)',
+                offset: 0
+              },
+              {
+                color: 'rgb(12,228,235,0.8)',
+                offset: 1
+              }
+            ])
           },
           emphasis: {
             areaStyle: {
-              color: 'rgb(12,228,235,0.5)'
+              color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
+                {
+                  color: 'rgb(8,91,121,0.5)',
+                  offset: 0
+                },
+                {
+                  color: 'rgb(12,228,235,0.5)',
+                  offset: 1
+                }
+              ])
             }
           },
           data: [{
@@ -144,6 +163,7 @@
               show: true,
               fontSize: 14,
               fontWeight: 'bold',
+              color: '#ff9933',
               formatter: function (params) {
                 return params.value
               }