diff --git a/.env.production b/.env.production
index 08c8d52..0259bbe 100644
--- a/.env.production
+++ b/.env.production
@@ -1,9 +1,9 @@
 VITE_APP_name = 机器人 - 大屏
 VITE_APP_content = 机器人
 # 请求的base api
-VITE_APP_baseApiURL = /sbdRobot
-VITE_APP_robotBaseApiURL = http://sgwpdm.ah.sgcc.com.cn/iws/sbdRobot
+VITE_APP_baseApiURL = /iws/sbdRobot
+VITE_APP_robotBaseApiURL = http://112.31.70.193:1854/icvs2/
 # 路由的base api
-VITE_APP_routeBasePath = /bnsRobot
-VITE_APP_biuldBase = /robot-screen-ui
+VITE_APP_routeBasePath = /rebotWeb 
+VITE_APP_biuldBase = ./
 VITE_APP_imgPreviewUrl = http://sgwpdm.ah.sgcc.com.cn/iws/minioFile/robot
\ No newline at end of file
diff --git a/src/action/storageManage.js b/src/action/storageManage.js
index d5d882d..6d3108d 100644
--- a/src/action/storageManage.js
+++ b/src/action/storageManage.js
@@ -11,7 +11,7 @@ import StorageS from 'storages-js'
 const allStorage = {}
 function createS(key, value) {
     if (!allStorage[key]) {
-        allStorage[key] = new StorageS(key, value, { modelName: 'local' })
+        allStorage[key] = new StorageS(key, value, { modelName: 'session' })
     }
     return allStorage[key]
 }
diff --git a/src/http/request.js b/src/http/request.js
index 2751fe1..b44528b 100644
--- a/src/http/request.js
+++ b/src/http/request.js
@@ -27,7 +27,8 @@ service.interceptors.request.use(
         // config.headers['token'] = userData.userInfo.token
 
         if (userData?.userInfo?.token) {
-            config.headers['Authorization'] = 'Bearer ' + userData?.userInfo?.token
+            // config.headers['Authorization'] = 'Bearer ' + userData?.userInfo?.token
+            config.headers['Token'] = userData?.userInfo?.token
         } else {
             config.headers['Token'] = 'test'
         }
diff --git a/src/http/robot_request.js b/src/http/robot_request.js
index dbea7e1..921dd79 100644
--- a/src/http/robot_request.js
+++ b/src/http/robot_request.js
@@ -26,11 +26,11 @@ service.interceptors.request.use(
         config.headers = config.headers || {}
         // config.headers['token'] = userData.userInfo.token
 
-        if (userData?.userInfo?.token) {
-            config.headers['Authorization'] = 'Bearer ' + userData?.userInfo?.token
-        } else {
-            config.headers['Token'] = 'test'
-        }
+        // if (userData?.userInfo?.token) {
+        //     config.headers['Authorization'] = 'Bearer ' + userData?.userInfo?.token
+        // } else {
+        //     config.headers['Token'] = 'test'
+        // }
         return config
     },
     () => {
diff --git a/src/router/index.js b/src/router/index.js
index a88276a..1906364 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@
  * 路由列表部分
  * 所有路由必须先手动写好，然后由后端菜单接口来进行匹配并且指定是否显示
  */
-import { createWebHistory, createRouter } from 'vue-router'
+import { createWebHistory, createWebHashHistory, createRouter } from 'vue-router'
 /**
  * 为路由配置meta相当于为该路由配置了基本信息，配置的属性如下
  * title 用作标签显示字样的字段
@@ -181,8 +181,8 @@ export const constantRoutes = [
 ]
 
 const router = createRouter({
-    history: createWebHistory(import.meta.env.VITE_APP_routeBasePath),
-    // history: createWebHistory(),
+    // history: createWebHistory(import.meta.env.VITE_APP_routeBasePath),
+    history: createWebHashHistory(),
     routes: constantRoutes,
 })
 
diff --git a/src/views/home/components/center-two.vue b/src/views/home/components/center-two.vue
index 6e0d079..aded9b8 100644
--- a/src/views/home/components/center-two.vue
+++ b/src/views/home/components/center-two.vue
@@ -290,7 +290,7 @@ onMounted(() => {
     nextTick(() => {
         const container = marqueeContainer.value
         imgWidth.value = (container.clientWidth - 40) / 4
-        imgHeight.value = `${container.clientHeight * 0.68}`
+        imgHeight.value = `${container.clientHeight * 0.78}`
     })
 })
 
diff --git a/src/views/home/components/control-deck-new.vue b/src/views/home/components/control-deck-new.vue
new file mode 100644
index 0000000..6bdf562
--- /dev/null
+++ b/src/views/home/components/control-deck-new.vue
@@ -0,0 +1,1035 @@
+<template>
+    <!-- 机器人操控面板 -->
+    <div class="control-deck child-container">
+        <!-- 第一行 -->
+        <n-grid :cols="24">
+            <n-grid-item :span="9">
+                <div class="row-1-item">摄像头</div>
+            </n-grid-item>
+            <n-grid-item :span="6">
+                <!-- <div class="row-1-item">升降杆</div> -->
+                <div
+                    class="row-1-item"
+                    style="display: flex; align-items: center; justify-content: center"
+                >
+                    <n-icon size="26">
+                        <!-- 绿色 -->
+                        <BatteryFullSharp
+                            color="#16E607"
+                            v-if="robotBaseInfo.dl >= 80 && robotBaseInfo.type != '充电中'"
+                        />
+                        <BatteryHalfSharp
+                            color="#E69807"
+                            v-else-if="robotBaseInfo.dl >= 50 && robotBaseInfo.type != '充电中'"
+                        />
+                        <BatteryDeadSharp
+                            color="#F90303"
+                            v-else-if="robotBaseInfo.type != '充电中'"
+                        />
+                        <BatteryChargingSharp
+                            color="#16E607"
+                            v-if="robotBaseInfo.type == '充电中'"
+                        />
+                    </n-icon>
+                    <span style="margin-left: 4px; font-size: 13px"> {{ robotBaseInfo.dl }}%</span>
+                </div>
+            </n-grid-item>
+            <n-grid-item :span="9">
+                <div class="row-1-item">底盘</div>
+            </n-grid-item>
+        </n-grid>
+        <!-- 第二行 -->
+        <n-grid :cols="24">
+            <n-grid-item :span="9">
+                <div class="row-2-item">
+                    <div>速度</div>
+                    <div>30</div>
+                </div>
+            </n-grid-item>
+            <n-grid-item :span="6">
+                <!-- <div class="row-2-item">
+                    <div>高度</div>
+                    <div>
+                        {{ currentHeight }}
+                    </div>
+                </div> -->
+
+                <div class="row-2-item">
+                    <div></div>
+                    <div style="width: 70px">
+                        {{ robotBaseInfo.type }}
+                    </div>
+                </div>
+            </n-grid-item>
+            <n-grid-item :span="9">
+                <div class="row-2-item">
+                    <div>速度</div>
+                    <div>30</div>
+                </div>
+            </n-grid-item>
+        </n-grid>
+        <!-- 第三行 -->
+        <n-grid :cols="10">
+            <n-grid-item :span="5">
+                <div class="row-3-item-1">
+                    <!-- 上下左右控制按钮 -->
+                    <img
+                        class="arrow-top hand-direction"
+                        @mousedown="handleChangeCamera('up')"
+                        @mouseup="handleChangeCamera('stop')"
+                        @mouseleave="handleChangeCamera('stop')"
+                        src="@/assets/home-imgs/control-2-arrow.png"
+                    />
+                    <img
+                        class="arrow-right hand-direction"
+                        @mousedown="handleChangeCamera('right')"
+                        @mouseup="handleChangeCamera('stop')"
+                        @mouseleave="handleChangeCamera('stop')"
+                        src="@/assets/home-imgs/control-2-arrow.png"
+                    />
+                    <img
+                        class="arrow-bottom hand-direction"
+                        @mousedown="handleChangeCamera('down')"
+                        @mouseup="handleChangeCamera('stop')"
+                        @mouseleave="handleChangeCamera('stop')"
+                        src="@/assets/home-imgs/control-2-arrow.png"
+                    />
+                    <img
+                        class="arrow-left hand-direction"
+                        @mousedown="handleChangeCamera('left')"
+                        @mouseup="handleChangeCamera('stop')"
+                        @mouseleave="handleChangeCamera('stop')"
+                        src="@/assets/home-imgs/control-2-arrow.png"
+                    />
+
+                    <!-- 中间的按钮 -->
+                    <div class="row-3-item-1-center">
+                        <img class="center-icon" :src="isStopLeft ? stopImg : startImg" />
+                    </div>
+
+                    <!-- 描述文字 -->
+                    <div class="text-top description-text">正前</div>
+                    <div class="text-bottom description-text">正后</div>
+                    <div class="text-left description-text">正左</div>
+                    <div class="text-right description-text">正右</div>
+
+                    <!-- 增加减少按钮 -->
+                    <div class="add-reduce-btn">
+                        <span>缩放</span>
+                        <img
+                            style="margin-bottom: 2px"
+                            @click="handleChangeZoomCamera('ZoomIn')"
+                            src="@/assets/home-imgs/control-2-add.png"
+                        />
+                        <img
+                            @click="handleChangeZoomCamera('ZoomOut')"
+                            src="@/assets/home-imgs/control-2-reduce.png"
+                        />
+                    </div>
+                </div>
+            </n-grid-item>
+            <n-grid-item :span="3" v-if="false">
+                <div class="row-3-item-2" ref="container">
+                    <!-- 上下滑动调节 -->
+                    <span
+                        ref="draggable"
+                        class="up-down-box"
+                        @mousedown="startDrag"
+                        :style="{ top: currentTop + 'px' }"
+                    />
+                </div>
+            </n-grid-item>
+            <n-grid-item :span="5">
+                <div class="row-3-item-3">
+                    <!-- 上下左右控制按钮 -->
+                    <img
+                        class="arrow-top"
+                        @mousedown="handleChangeRobot('5')"
+                        @mouseup="handleChangeRobot(9)"
+                        @mouseleave="handleChangeRobot(9)"
+                        src="@/assets/home-imgs/control-2-arrow.png"
+                    />
+                    <img
+                        class="arrow-right"
+                        @mousedown="handleChangeRobot('8')"
+                        @mouseup="handleChangeRobot(9)"
+                        @mouseleave="handleChangeRobot(9)"
+                        src="@/assets/home-imgs/control-2-arrow.png"
+                    />
+                    <img
+                        class="arrow-bottom"
+                        @mousedown="handleChangeRobot('6')"
+                        @mouseup="handleChangeRobot(9)"
+                        @mouseleave="handleChangeRobot(9)"
+                        src="@/assets/home-imgs/control-2-arrow.png"
+                    />
+                    <img
+                        class="arrow-left"
+                        @mousedown="handleChangeRobot('7')"
+                        @mouseup="handleChangeRobot(9)"
+                        @mouseleave="handleChangeRobot(9)"
+                        src="@/assets/home-imgs/control-2-arrow.png"
+                    />
+
+                    <!-- 描述文字 -->
+                    <div class="text-top description-text">前进</div>
+                    <div class="text-bottom description-text">后退</div>
+                    <div class="text-left description-text">左转</div>
+                    <div class="text-right description-text">右转</div>
+
+                    <div class="row-3-item-1-center">
+                        <img class="center-icon" :src="isStopRight ? startImg : stopImg" />
+                    </div>
+                </div>
+            </n-grid-item>
+        </n-grid>
+        <!-- 第四行 -->
+        <n-grid :cols="12" class="row-4">
+            <n-grid-item :span="3">
+                <div>警灯</div>
+            </n-grid-item>
+            <n-grid-item :span="3">
+                <div>
+                    <n-radio
+                        value="关"
+                        name="basic-demo"
+                        @change="handleChange1"
+                        :checked="checkedValue === '关'"
+                    >
+                        关
+                    </n-radio>
+                </div>
+            </n-grid-item>
+            <n-grid-item :span="3">
+                <div>
+                    <n-radio
+                        value="闪烁"
+                        name="basic-demo"
+                        @change="handleChange2"
+                        :checked="checkedValue === '闪烁'"
+                    >
+                        闪烁
+                    </n-radio>
+                </div>
+            </n-grid-item>
+            <n-grid-item :span="3">
+                <div class="row-4-item">
+                    <n-radio
+                        value="运动时闪烁"
+                        name="basic-demo"
+                        @change="handleChange3"
+                        :checked="checkedValue === '运动时闪烁'"
+                    >
+                        运动时闪烁
+                    </n-radio>
+                </div>
+            </n-grid-item>
+        </n-grid>
+        <!-- 第五行 -->
+        <n-grid :cols="12" class="row-5">
+            <n-grid-item :span="3">
+                <div>录音播放</div>
+            </n-grid-item>
+            <n-grid-item :span="3">
+                <div>
+                    <div>
+                        <!-- <n-select
+                            size="tiny"
+                            v-model:value="selectValue"
+                            :options="selectOptions"
+                        /> -->
+
+                        <!-- <n-select
+                            size="small"
+                            v-model:value="selectValue"
+                            :options="selectOptions"
+                        /> -->
+
+                        <!-- <n-select
+                            :options="selectOptions"
+                            size="small"
+                            :dropdown-style="{
+                                borderRadius: '4px',
+                                boxShadow: '0 4px 6px -1px rgba(0, 0, 0, 0.1)',
+                                color: '#fff',
+                            }"
+                        /> -->
+
+                        <!-- <n-button type="info" size="small">请上传</n-button> -->
+
+                        <n-upload
+                            :accept="audioMimeTypes"
+                            :show-file-list="false"
+                            :default-upload="false"
+                            @before-upload="beforeUpload"
+                            @change="handleChangeUpload"
+                            v-if="!audioInfo"
+                        >
+                            <n-button type="info" size="small">请上传</n-button>
+                        </n-upload>
+
+                        <n-popselect
+                            trigger="click"
+                            v-model:value="audioValue"
+                            :options="audioOptions"
+                            @update:value="handleChangeAudio"
+                            v-else
+                        >
+                            <n-button type="info" size="small">
+                                {{ audioInfo?.fileName }}
+                            </n-button>
+                        </n-popselect>
+                    </div>
+                    <!-- <div style="margin-top: 16px">
+                        <n-radio
+                            :checked="checkedValue === '循环播放'"
+                            value="循环播放"
+                            name="basic-demo"
+                            @change="handleChange4"
+                        >
+                            循环播放
+                        </n-radio>
+                    </div> -->
+                </div>
+            </n-grid-item>
+            <n-grid-item :span="6">
+                <div class="row-5-item">
+                    <div class="row-5-item-1">
+                        <img src="@/assets/home-imgs/control-3-voice.png" alt="" />
+                        <div style="width: 60%">
+                            <n-slider
+                                :step="10"
+                                :default-value="50"
+                                :format-tooltip="formatTooltip"
+                                @update:value="handleChangeVolume"
+                            />
+                        </div>
+                    </div>
+                    <!-- <div class="row-5-item-1" style="margin-top: 16px">
+                        <img src="@/assets/home-imgs/control-3-video.png" alt="" />
+                        <div style="width: 60%">
+                            <n-slider
+                                :default-value="50"
+                                :step="10"
+                                :format-tooltip="formatTooltip"
+                            />
+                        </div>
+                    </div> -->
+                </div>
+            </n-grid-item>
+        </n-grid>
+
+        <!-- 第六行 -->
+        <n-grid :cols="10" class="row-6">
+            <n-grid-item :span="4">
+                <div class="row-6-item" @click="handleChangeRobot(10)">回桩充电</div>
+            </n-grid-item>
+            <n-grid-item :span="3">
+                <div class="row-6-item-1">
+                    <img src="@/assets/home-imgs/control-3-mk.png" alt="" />
+                </div>
+            </n-grid-item>
+        </n-grid>
+    </div>
+
+    <n-modal v-model:show="selectPlayType">
+        <n-card
+            size="huge"
+            role="dialog"
+            aria-modal="true"
+            :bordered="false"
+            class="modal-container"
+        >
+            <n-form
+                ref="formRef"
+                size="small"
+                label-placement="left"
+                style="margin-top: 10px"
+                :model="playParams"
+            >
+                <n-form-item label="播放类型：">
+                    <n-radio-group v-model:value="playParams.playType" name="radiogroup">
+                        <n-space>
+                            <n-radio :value="1"> 次数播放 </n-radio>
+                            <n-radio :value="0"> 循环播放 </n-radio>
+                        </n-space>
+                    </n-radio-group>
+                </n-form-item>
+
+                <n-form-item label="播放次数：" v-if="playParams.playType === 1">
+                    <n-input-number
+                        v-model:value="playParams.playCount"
+                        placeholder="输入播放次数"
+                        :show-button="false"
+                    />
+                </n-form-item>
+
+                <n-button type="info" @click="handlePlayAudio"> 确定</n-button>
+                <n-button color="#6E90A9" style="margin-left: 8px" @click="selectPlayType = false">
+                    取消
+                </n-button>
+            </n-form>
+        </n-card>
+    </n-modal>
+</template>
+
+<script setup>
+import { ref, onMounted, h } from 'vue'
+
+import {
+    stopDeviceCameraApi,
+    changeDeviceCameraApi,
+    stopDeviceCameraZoomApi,
+    changeDeviceCameraZoomInApi,
+    changeDeviceCameraZoomOutApi,
+} from '@/utils/initLogin'
+import { handleRobotActionApi, uploadAudioApi, getAudioInfoApi, deleteAudioApi } from '@/api/home'
+import { useRobotDataStore } from '@/store/robot'
+import { getRobotTokenFn, getRobotDeviceListFn } from '@/utils/getRobotInfo.js'
+import {
+    BatteryHalfSharp,
+    BatteryDeadSharp,
+    BatteryFullSharp,
+    BatteryChargingSharp,
+} from '@vicons/ionicons5'
+import { useMessage, useDialog, NRadio, NRadioGroup, NInputNumber, NSpace } from 'naive-ui'
+import { debounce } from 'lodash'
+
+import stopImg from '@/assets/home-imgs/control-2-stop.png'
+import startImg from '@/assets/home-imgs/control-2-start.png'
+
+const dialog = useDialog()
+const message = useMessage()
+const robotData = useRobotDataStore()
+const isStopLeft = ref(true)
+const isStopRight = ref(false)
+const upDownHeight = ref(30)
+const container = ref(null)
+const draggable = ref(null)
+const isDragging = ref(false)
+const currentTop = ref(0)
+const startY = ref(0)
+const startTop = ref(0)
+const checkedValue = ref('')
+const selectValue = ref('')
+const deviceToken = ref('')
+const deviceInfo = ref({})
+const isZoom = ref(false)
+const robotBaseInfo = ref({})
+const selectPlayType = ref(false)
+
+const audioValue = ref('')
+const audioInfo = ref(null)
+
+const playParams = ref({
+    playType: 1,
+    playCount: 1,
+})
+
+const audioMimeTypes = ref(
+    '.pcm,.wav,.aac,audio/wav,audio/x-wav,audio/x-aiff,audio/aac,audio/x-aac',
+)
+
+const audioOptions = ref([
+    {
+        label: '播放',
+        value: '播放',
+    },
+    {
+        label: '删除',
+        value: '删除',
+    },
+    {
+        label: '暂停',
+        value: '暂停',
+    },
+])
+
+const beforeUpload = ({ file }) => {
+    const allowedExtensions = ['.pcm', '.wav', '.aac']
+    const fileName = file.name.toLowerCase()
+    const isValid = allowedExtensions.some((ext) => fileName.endsWith(ext))
+
+    if (!isValid) {
+        message.error('只能上传 PCM、WAV、AAC 格式的音频文件')
+        return false
+    }
+    return true
+}
+
+// 上传音频
+const handleChangeUpload = async (e) => {
+    const file = e.file
+    const formData = new FormData()
+    formData.append('file', file.file)
+    formData.append('puid', deviceInfo.value?.puId)
+
+    const { data: res } = await uploadAudioApi(formData)
+
+    if (res.code == 200) {
+        message.success('上传音频文件成功')
+
+        getAudioInfo()
+    } else {
+        message.error('上传音频文件失败')
+    }
+}
+
+// 获取音频信息
+const getAudioInfo = async () => {
+    const { data: res } = await getAudioInfoApi({
+        puid: deviceInfo.value?.puId,
+    })
+
+    if (res.code == 200) {
+        audioInfo.value = res?.data
+    }
+}
+
+const handleChangeAudio = async (e) => {
+    // console.log(e, '选择音频操作')
+    if (e === '播放') {
+        // showPlayTypeDialog()
+
+        selectPlayType.value = true
+    } else if (e === '删除') {
+        const { data: res } = await deleteAudioApi({
+            puId: robotData.robotInfo?.puId,
+            id: audioInfo.value?.id,
+        })
+
+        if (res.code == 200) {
+            message.success('删除音频成功')
+        } else {
+            message.error('删除音频失败')
+        }
+    } else {
+        const { data: res } = await handleRobotActionApi({
+            puId: robotData.robotInfo?.puId,
+            type: '17',
+            enable: '0',
+            videoId: audioInfo.value?.id,
+        })
+
+        if (res.code == 200) {
+            message.success('已暂停')
+        } else {
+            message.error('暂停音频失败')
+        }
+    }
+}
+
+// 计算当前高度百分比(0-100)
+const currentHeight = computed(() => {
+    if (!container.value) return 0
+    const containerHeight = container.value.offsetHeight
+    const draggableHeight = draggable.value?.offsetHeight || 0
+    const maxTop = containerHeight - draggableHeight - 20 // 20是底部初始偏移
+
+    // 计算百分比 (0-100)
+    return Math.round(100 - (currentTop.value / maxTop) * 100)
+})
+
+const startDrag = (e) => {
+    isDragging.value = true
+    startY.value = e.clientY
+    startTop.value = currentTop.value
+
+    document.addEventListener('mousemove', onDrag)
+    document.addEventListener('mouseup', stopDrag)
+}
+
+const onDrag = (e) => {
+    if (!isDragging.value) return
+
+    const deltaY = e.clientY - startY.value
+    let newTop = startTop.value + deltaY
+
+    const containerHeight = container.value.offsetHeight
+    const draggableHeight = draggable.value.offsetHeight
+    const maxTop = containerHeight - draggableHeight - 20
+
+    newTop = Math.max(0, Math.min(newTop, maxTop))
+    currentTop.value = newTop
+}
+
+const stopDrag = () => {
+    isDragging.value = false
+    document.removeEventListener('mousemove', onDrag)
+    document.removeEventListener('mouseup', stopDrag)
+
+    // 拖动结束时可以在这里使用currentHeight.value
+    console.log('当前高度:', currentHeight.value)
+}
+
+onMounted(() => {
+    // const containerHeight = container.value.offsetHeight
+    // const draggableHeight = draggable.value.offsetHeight
+    // const maxTop = containerHeight - draggableHeight - 20
+    // currentTop.value = maxTop * (1 - upDownHeight.value / 100)
+})
+
+const handleChange1 = (e) => {
+    console.log(e)
+    checkedValue.value = e.target.value
+}
+const handleChange2 = (e) => {
+    console.log(e)
+    checkedValue.value = e.target.value
+}
+const handleChange3 = (e) => {
+    checkedValue.value = e.target.value
+}
+const handleChange4 = (e) => {
+    checkedValue.value = e.target.value
+}
+
+const formatTooltip = (value) => {
+    return `${value}%`
+}
+
+// 停止缩放
+const handleStopDeviceCameraZoom = async () => {
+    isZoom.value = false
+    const res = await stopDeviceCameraZoomApi({
+        idx: 0,
+        token: deviceToken.value,
+        puid: '201115200268437643',
+    })
+
+    console.log(res, '停止位置---')
+}
+
+// 操控机器人上方的摄像头
+const handleChangeCamera = debounce(async (motion) => {
+    if (motion === 'stop' && isZoom.value) {
+        isStopLeft.value = true
+        handleStopDeviceCameraZoom()
+        return
+    }
+    if (motion === 'stop') {
+        isStopLeft.value = true
+    } else {
+        isStopLeft.value = false
+    }
+    if (!deviceInfo.value?.puId) {
+        message.error('当前机器人未连接', {
+            duration: 1000,
+        })
+        return
+    }
+    const res = await changeDeviceCameraApi({
+        token: deviceToken.value,
+        puid: deviceInfo.value?.puId,
+        idx: 0,
+        motion,
+    })
+}, 1000)
+
+// 球机缩放
+const handleChangeZoomCamera = async (motion) => {
+    isStopLeft.value = false
+    isZoom.value = true
+    if (motion === 'ZoomIn') {
+        const res = await changeDeviceCameraZoomInApi({
+            token: deviceToken.value,
+            puid: deviceInfo.value?.puId,
+            idx: 0,
+        })
+    } else {
+        const res = await changeDeviceCameraZoomOutApi({
+            token: deviceToken.value,
+            puid: deviceInfo.value?.puId,
+            idx: 0,
+        })
+    }
+}
+
+// 操控机器人
+const handleChangeRobot = debounce(async (type) => {
+    // type 5 前进 6 后退 7 左转 8 右转
+    if (!robotData.robotInfo?.puId) {
+        message.error('当前机器人未连接', {
+            duration: 1000,
+        })
+        return
+    }
+
+    const params = {
+        puId: robotData.robotInfo?.puId,
+        type,
+    }
+
+    console.log(params, 'params---')
+
+    const res = await handleRobotActionApi(params)
+    console.log(res, '操控机器人---')
+    if (res.code == 200 && type != 9) {
+        isStopRight.value = true
+    }
+    if (res.code == 200 && type == 9) {
+        isStopRight.value = false
+    }
+}, 1000)
+
+// 停止机器人
+const handleStopRobot = async () => {
+    console.log('停止机器人')
+}
+
+// 获取机器人的基础信息
+const getRobotBaseInfo = async () => {
+    const { data: res } = await handleRobotActionApi({
+        puId: deviceInfo.value?.puId,
+        type: '1',
+    })
+
+    robotBaseInfo.value = res.data
+}
+
+// 确认播放
+const handlePlayAudio = async () => {
+    const loop = playParams.value.playType === 0 ? 0 : playParams.value.playCount
+    const { data: res } = await handleRobotActionApi({
+        puId: robotData.robotInfo?.puId,
+        type: '17',
+        loop,
+        enable: '1',
+        videoId: audioInfo.value?.id,
+    })
+
+    if (res.code == 200) {
+        message.success('播放音频成功')
+        selectPlayType.value = false
+    } else {
+        message.error('播放音频失败')
+    }
+}
+
+// 音量选择
+
+const handleChangeVolume = debounce(async (value) => {
+    const { data: res } = await handleRobotActionApi({
+        puId: robotData.robotInfo?.puId,
+        type: '18',
+        sound: value,
+        videoId: audioInfo.value?.id,
+    })
+    if (res.code == 200) {
+        message.success('音量调整成功')
+    } else {
+        message.error('音量调整失败')
+    }
+}, 1000)
+
+onMounted(async () => {
+    const token = await getRobotTokenFn() // 获取设备token
+    const device = await getRobotDeviceListFn() // 获取设备信息
+    deviceToken.value = token
+    deviceInfo.value = device
+    getRobotBaseInfo()
+    getAudioInfo()
+})
+</script>
+<style lang="scss" scoped>
+.control-deck {
+    justify-content: space-between;
+}
+.row-1-item,
+.row-2-item {
+    width: 100px;
+    margin: 0 auto;
+}
+
+.row-1-item {
+    // height: 28px;
+    background: url('@/assets/home-imgs/control-1-bg.png') no-repeat center center;
+    background-size: 100% 100%;
+    line-height: 28px;
+    text-align: center;
+}
+
+.row-2-item {
+    // margin-top: 6px;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+
+    & div:last-child {
+        // width: 32px;
+        height: 18px;
+        background-color: #005899;
+        border-radius: 6px;
+        font-size: 12px;
+        text-align: center;
+        line-height: 18px;
+        padding: 4px 10px;
+    }
+}
+
+.row-3-item-1,
+.row-3-item-3 {
+    width: 68px;
+    height: 68px;
+    margin: 20px auto 0;
+    position: relative;
+    background: url('@/assets/home-imgs/control-2-round.png') no-repeat center center;
+    background-size: 100% 100%;
+
+    > img {
+        width: 16px;
+        height: 18px;
+        cursor: pointer;
+        object-fit: contain;
+    }
+
+    // // 增加一个移入时的放大平滑动画效果
+    // .hand-direction:hover {
+    //     transform: scale(1.1);
+    //     transition: transform 0.3s ease-in-out;
+    // }
+
+    .arrow-top {
+        position: absolute;
+        top: 1px;
+        left: 50%;
+        transform: translateX(-50%) rotate(-90deg);
+    }
+    .arrow-right {
+        position: absolute;
+        top: 50%;
+        right: 1px;
+        transform: translateY(-50%);
+    }
+    .arrow-bottom {
+        position: absolute;
+        bottom: 1px;
+        left: 50%;
+        transform: translateX(-50%) rotate(90deg);
+    }
+    .arrow-left {
+        position: absolute;
+        top: 50%;
+        left: 1px;
+        transform: translateY(-50%) rotate(-180deg);
+    }
+
+    .row-3-item-1-center {
+        width: 16px;
+        height: 16px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transform: translate(-50%, -50%) rotate(45deg);
+        border: 2px solid #7fc0ff;
+        border-radius: 4px;
+        background-color: #2f78bf;
+        cursor: pointer;
+
+        > img {
+            width: 9px;
+            height: 9px;
+            object-fit: contain;
+            transform: rotate(-45deg);
+        }
+    }
+
+    // 描述文字
+    .description-text {
+        position: absolute;
+        font-size: 12px;
+    }
+
+    .text-top {
+        left: 50%;
+        top: -28px;
+        transform: translateX(-50%);
+    }
+    .text-bottom {
+        left: 50%;
+        bottom: -28px;
+        transform: translateX(-50%);
+    }
+    .text-top,
+    .text-bottom {
+        width: 36px;
+        height: 22px;
+        border: 1px solid #7fc0ff;
+        border-radius: 4px;
+        text-align: center;
+        line-height: 22px;
+    }
+
+    .text-left {
+        left: -28px;
+        top: 50%;
+        transform: translateY(-50%);
+    }
+    .text-right {
+        right: -28px;
+        top: 50%;
+        transform: translateY(-50%);
+    }
+    .text-left,
+    .text-right {
+        height: 36px;
+        width: 22px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #7fc0ff;
+        border-radius: 4px;
+        // 使文字竖向展示 并垂直居中
+        writing-mode: vertical-rl;
+        text-orientation: upright;
+    }
+
+    .add-reduce-btn {
+        position: absolute;
+        right: -58px;
+        top: -16px;
+        // height: 100px;
+        width: 20px;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+
+        span {
+            font-size: 13px;
+            width: 30px;
+            text-align: center;
+            color: #7fc0ff;
+        }
+
+        img {
+            width: 20px;
+            height: 50px;
+            object-fit: contain;
+            cursor: pointer;
+        }
+    }
+}
+
+.row-3-item-3 {
+    width: 68px;
+    height: 68px;
+    margin: 20px auto 0 !important;
+
+    > img {
+        width: 16px;
+        height: 18px;
+        cursor: pointer;
+        object-fit: contain;
+    }
+}
+
+.row-3-item-2 {
+    width: 60px;
+    height: 120px;
+    margin: 32px auto 0 !important;
+    background: url('@/assets/home-imgs/control-2-up-down.png') no-repeat center center;
+    background-size: 100% 100%;
+    position: relative;
+    user-select: none;
+
+    .up-down-box {
+        position: absolute;
+        left: 50%;
+        width: 30px;
+        height: 10px;
+        background: url('@/assets/home-imgs/control-2-up-down-hand.png') no-repeat center center;
+        background-size: 100% 100%;
+        transform: translateX(-50%);
+        cursor: pointer;
+        touch-action: none;
+    }
+}
+.row-4 {
+    // margin: 34px 0;
+    .row-4-item {
+        text-align: center;
+    }
+}
+
+.row-5-item-1 {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    > img {
+        width: 16px;
+        height: 16px;
+        margin-right: 10px;
+        object-fit: contain;
+    }
+}
+
+.row-6 {
+    // margin-top: 20px;
+    display: flex;
+    align-items: center;
+}
+
+.row-6-item {
+    padding: 2px 8px;
+    display: inline-block;
+    background-color: #005db6;
+    border: 1px solid #7fc0ff;
+    border-radius: 4px;
+    cursor: pointer;
+}
+
+.row-6-item-1 {
+    text-align: center;
+    img {
+        width: 32px;
+        height: 48px;
+        object-fit: contain;
+        cursor: pointer;
+    }
+}
+
+:deep(.n-radio__label) {
+    color: #fff !important;
+}
+
+:deep(.n-radio__dot) {
+    background: transparent;
+    border: 1px solid #7fc0ff;
+    box-shadow: none;
+}
+
+:deep(.n-radio__dot::before) {
+    background: #7fc0ff;
+}
+
+// :deep(.n-base-selection .n-base-selection-label) {
+//     background-color: #054a92;
+//     color: #fff;
+// }
+
+:deep(.n-slider .n-slider-rail .n-slider-rail__fill) {
+    background-color: #7fc0ff;
+}
+:deep(.n-slider .n-slider-handles .n-slider-handle-wrapper .n-slider-handle) {
+    background-color: #7fc0ff;
+}
+
+:deep(.n-slider .n-slider-rail) {
+    background-color: #2d6098;
+}
+
+.modal-container {
+    height: 30vh;
+    width: 30%;
+    display: flex;
+    flex-direction: column;
+    background: url('@/assets/home-imgs/modal-bg.png') no-repeat center center;
+    background-size: 100% 100%;
+}
+</style>
diff --git a/src/views/home/components/modal-content/add-or-edit-marker-form.vue b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
index f13be6b..8d971ff 100644
--- a/src/views/home/components/modal-content/add-or-edit-marker-form.vue
+++ b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
@@ -2,10 +2,10 @@
     <DialogModal
         @onHandleCloseModal="onHandleCloseAddModal"
         :modalTitle="`${markerParams.type}预置点位`"
-        :width="`120vh`"
-        :height="`90vh`"
+        :width="`140vh`"
+        :height="`110vh`"
     >
-        <div style="display: flex; flex-direction: column; height: 100%">
+        <div class="add-or-edit-marker-form">
             <n-form
                 ref="addOrEditFormRef"
                 size="small"
@@ -117,7 +117,7 @@
                 </n-grid>
             </n-form>
 
-            <n-flex justify="space-between" style="flex: 1; margin-top: 10px">
+            <n-flex justify="space-between" style="flex: 1; margin-top: 6px">
                 <div class="left-box" style="width: 49%">
                     <!-- 放置video -->
                     <FlvPlayer :cameraNode="cameraNode" :videoId="`video-3`" />
@@ -393,3 +393,28 @@ onBeforeUnmount(() => {
     }
 })
 </script>
+
+<style lang="scss" scoped>
+.add-or-edit-marker-form {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: auto;
+    // 滚动条样式
+    // 优化一下滚动条
+    &::-webkit-scrollbar {
+        width: 6px;
+    }
+    &::-webkit-scrollbar-thumb {
+        background-color: #6e90a9;
+    }
+
+    // 优化滚动条
+    &::-webkit-scrollbar {
+        width: 6px;
+    }
+    &::-webkit-scrollbar-thumb {
+        background-color: #6e90a9;
+    }
+}
+</style>
diff --git a/src/views/home/components/modal-content/control-deck.vue b/src/views/home/components/modal-content/control-deck.vue
index c31190a..3054fc5 100644
--- a/src/views/home/components/modal-content/control-deck.vue
+++ b/src/views/home/components/modal-content/control-deck.vue
@@ -248,42 +248,42 @@ onMounted(async () => {})
 }
 .row-3-item-1,
 .row-3-item-3 {
-    width: 100px;
-    height: 100px;
-    margin: 42px auto 0;
+    width: 68px;
+    height: 68px;
+    margin: 20px auto 0;
     position: relative;
     background: url('@/assets/home-imgs/control-2-round.png') no-repeat center center;
     background-size: 100% 100%;
 
     > img {
-        width: 24px;
-        height: 26px;
+        width: 18px;
+        height: 18px;
         cursor: pointer;
         object-fit: contain;
     }
 
     .arrow-top {
         position: absolute;
-        top: 6px;
+        top: 1px;
         left: 50%;
         transform: translateX(-50%) rotate(-90deg);
     }
     .arrow-right {
         position: absolute;
         top: 50%;
-        right: 8px;
+        right: 1px;
         transform: translateY(-50%);
     }
     .arrow-bottom {
         position: absolute;
-        bottom: 6px;
+        bottom: 1px;
         left: 50%;
         transform: translateX(-50%) rotate(90deg);
     }
     .arrow-left {
         position: absolute;
         top: 50%;
-        left: 8px;
+        left: 1px;
         transform: translateY(-50%) rotate(-180deg);
     }
 
diff --git a/src/views/home/components/right-one.vue b/src/views/home/components/right-one.vue
index 532fc99..635ca80 100644
--- a/src/views/home/components/right-one.vue
+++ b/src/views/home/components/right-one.vue
@@ -152,7 +152,7 @@
                 :scroll-x="10"
                 flex-height
                 :columns="tableColumns_1"
-                :style="{ height: `70%` }"
+                :style="{ height: `50%` }"
                 v-if="activeIndex === 0"
             />
 
@@ -220,11 +220,11 @@
                 :scroll-x="10"
                 :data="tableData_2"
                 :columns="tableColumns_2"
-                :style="{ height: `70%` }"
+                :style="{ height: `50%` }"
                 v-if="activeIndex === 1"
             />
 
-            <div style="margin-top: 10px; display: flex; justify-content: flex-end">
+            <div style="margin-top: 4px; display: flex; justify-content: flex-end">
                 <n-pagination
                     show-size-picker
                     v-if="activeIndex === 0"
@@ -237,7 +237,7 @@
                 />
             </div>
 
-            <div style="margin-top: 10px; display: flex; justify-content: flex-end">
+            <div style="margin-top: 4px; display: flex; justify-content: flex-end">
                 <n-pagination
                     show-size-picker
                     v-if="activeIndex === 1"
@@ -456,7 +456,7 @@ const onHandleBatchSend = async () => {
         message.success('下发成功')
         getProjectPersonList()
     } else {
-        message.error(res.message)
+        message.error(res.msg)
     }
 }
 const onHandlePartSend = async () => {
@@ -1053,7 +1053,7 @@ onUpdated(() => {
 
 .more-panel-card {
     width: 80%;
-    height: 90vh;
+    height: 120vh;
     display: flex;
     flex-direction: column;
     background: url('@/assets/home-imgs/modal-bg.png') no-repeat center center;
@@ -1107,15 +1107,15 @@ onUpdated(() => {
 
 .tabs-btns {
     display: flex;
-    margin: 8px 0;
+    margin: 6px 0;
 
     .tabs-btn {
-        width: 100px;
-        height: 42px;
+        width: 90px;
+        height: 32px;
         background-color: #1b4589;
         color: #fff;
         text-align: center;
-        line-height: 42px;
+        line-height: 32px;
         cursor: pointer;
     }
 
diff --git a/src/views/home/components/right-two/index.vue b/src/views/home/components/right-two/index.vue
index 5a0ed44..f51291b 100644
--- a/src/views/home/components/right-two/index.vue
+++ b/src/views/home/components/right-two/index.vue
@@ -89,10 +89,10 @@ const activeIndex = ref(0)
 const currentComponent = ref('comp-a')
 
 const compareList = ref([
-    { title: '巡检次数', total: 58, amount: 26, unit: '次' },
-    { title: '巡检照片', total: 100, amount: 100, unit: '张' },
-    { title: '比对次数', total: 100, amount: 100, unit: '次' },
-    { title: '异常数量', total: 100, amount: 100, unit: '项' },
+    { title: '巡检次数', total: 0, amount: 0, unit: '次' },
+    { title: '巡检照片', total: 0, amount: 0, unit: '张' },
+    { title: '比对次数', total: 0, amount: 0, unit: '次' },
+    { title: '异常数量', total: 0, amount: 0, unit: '项' },
 ])
 const componentMap = {
     'comp-a': TapsOne,
@@ -247,7 +247,7 @@ const onHandleTabs = (component, index) => {
 
 .more-panel-card {
     width: 80%;
-    height: 80vh;
+    height: 120vh;
     display: flex;
     flex-direction: column;
     background: url('@/assets/home-imgs/modal-bg.png') no-repeat center center;
@@ -265,12 +265,12 @@ const onHandleTabs = (component, index) => {
     margin: 20px 0;
 
     .tabs-btn {
-        width: 100px;
-        height: 42px;
+        width: 90px;
+        height: 32px;
         background-color: #1b4589;
         color: #fff;
         text-align: center;
-        line-height: 42px;
+        line-height: 32px;
         cursor: pointer;
     }
 
diff --git a/src/views/home/components/right-two/taps-two.vue b/src/views/home/components/right-two/taps-two.vue
index 3117229..0368d99 100644
--- a/src/views/home/components/right-two/taps-two.vue
+++ b/src/views/home/components/right-two/taps-two.vue
@@ -68,7 +68,7 @@ const queryParams = ref({
 onMounted(() => {
     const tableContainer = tableContainerRef.value
     if (tableContainer) {
-        imageHeight.value = ((tableContainer.clientHeight - 10) / 2) * 0.68
+        imageHeight.value = ((tableContainer.clientHeight - 10) / 2) * 0.78
         imageWidth.value = (tableContainer.clientWidth - 30) / 4
     }
 })
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f230aab..d55bbca 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -55,7 +55,7 @@
                 </div>
 
                 <div class="robot-7" v-if="fullScreenVisibleNew">
-                    <ControlDeck />
+                    <ControlDeckNew />
                 </div>
             </div>
         </div>
@@ -89,6 +89,7 @@ import CenterTwo from './components/center-two.vue' // 中二
 import RightOne from './components/right-one.vue' // 右一
 import RightTwo from './components/right-two/index.vue' // 右二
 import ControlDeck from './components/control-deck.vue' // 控制台
+import ControlDeckNew from './components/control-deck-new.vue' // 控制台
 import { decrypt, encrypt } from '@/utils/encrypt'
 
 import { getRobotTokenFn, getRobotDeviceListFn } from '@/utils/getRobotInfo' // 获取机器人信息