diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_camera.png b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_camera.png
index 4464f9f..bcdf530 100644
Binary files a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_camera.png and b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_camera.png differ
diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_email.png b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_email.png
index 184799f..7cc0dbe 100644
Binary files a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_email.png and b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_email.png differ
diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_phone.png b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_phone.png
index 770340a..672c334 100644
Binary files a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_phone.png and b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_phone.png differ
diff --git a/code/VideoAccess-VCMP/web/client/src/components/textScroll.jsx b/code/VideoAccess-VCMP/web/client/src/components/textScroll.jsx
index 2a4d2af..2055c63 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/textScroll.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/textScroll.jsx
@@ -3,77 +3,80 @@ import moment from 'moment'
 import './textScroll.less'
 
 function TextScroll (props) {
-   const { content, duration,roll } = props
-   const [showContent, setShowContent] = useState('')
-   const showIndex = useRef(0)
-   const initialization = useRef(false)
-   const cancel = useRef(false)
-   useEffect(() => {
-      if (content.length) {
-        if(roll){
-            let contentParent = document.getElementById('marquee_box')
-            document.getElementById('contentPMakeUp').style.width = contentParent.clientWidth + 'px'
-            const contentP = document.getElementById('contentP')
-            contentP.style.visibility = 'visible'
-            setShowContent(content[0])
-            window.cancelAnimationFrame(cancel.current)
-            contentParent.scrollLeft = 0
-            initialization.current=false
-            showIndex.current = 0
-        }
-        else{
-            let repeatTime = moment()
-            let refreshTime = moment()
-            const scroll = () => {
-            let contentParent = document.getElementById('marquee_box')
-            document.getElementById('contentPMakeUp').style.width = contentParent.clientWidth + 'px'
-            //初始化
-            // if(!showContent&&!initialization.current){
-            if(!initialization.current){
+    const { content, duration, roll } = props
+    console.log(content, roll);
+    const [showContent, setShowContent] = useState('')
+    const showIndex = useRef(0)
+    const initialization = useRef(false)
+    const cancel = useRef(false)
+    useEffect(() => {
+        if (content.length) {
+            if (roll) {
+                let contentParent = document.getElementById('marquee_box')
+                console.log(document.getElementById('contentPMakeUp'));
+                document.getElementById('contentPMakeUp').style.width = contentParent.clientWidth + 'px'
                 const contentP = document.getElementById('contentP')
-                contentParent.scrollLeft = 0
-                setShowContent(content[showIndex.current])
-                showIndex.current = (showIndex.current + 1) % content.length
                 contentP.style.visibility = 'visible'
-                initialization.current=true
+                setShowContent(content[0])
+                window.cancelAnimationFrame(cancel.current)
+                contentParent.scrollLeft = 0
+                initialization.current = false
+                showIndex.current = 0
+            }
+            else {
+                let repeatTime = moment()
+                let refreshTime = moment()
+                const scroll = () => {
+                    let contentParent = document.getElementById('marquee_box')
+                    console.log(document.getElementById('contentPMakeUp'));
+                    document.getElementById('contentPMakeUp').style.width = contentParent.clientWidth + 'px'
+                    //初始化
+                    // if(!showContent&&!initialization.current){
+                    if (!initialization.current) {
+                        const contentP = document.getElementById('contentP')
+                        contentParent.scrollLeft = 0
+                        setShowContent(content[showIndex.current])
+                        showIndex.current = (showIndex.current + 1) % content.length
+                        contentP.style.visibility = 'visible'
+                        initialization.current = true
+                    }
+                    // 控制频率
+                    if (moment().diff(refreshTime) > 1000 / 60) {
+                        const contentP = document.getElementById('contentP')
+                        // 静态等待时间
+                        if (moment().diff(repeatTime) > 1000 * 1.5) {
+                            contentP.style.visibility = 'visible'
+                        }
+                        // 滚动
+                        if (moment().diff(repeatTime) > 1000 * 3) {
+                            contentParent.scrollLeft = contentParent.scrollLeft + 1
+                        }
+                        // 滚完 重置
+                        if (contentParent.scrollLeft >= contentP.clientWidth + 24) {
+                            contentParent.scrollLeft = 0
+                            repeatTime = moment()
+                            setShowContent(content[showIndex.current])
+                            showIndex.current = (showIndex.current + 1) % content.length
+                            contentP.style.visibility = 'hidden'
+                        }
+                        refreshTime = moment()
+                    }
+                    let text = null
+                    text = window.requestAnimationFrame(scroll)
+                    cancel.current = text
                 }
-            // 控制频率
-            if (moment().diff(refreshTime) > 1000 / 60) {
-               const contentP = document.getElementById('contentP')
-               // 静态等待时间
-               if (moment().diff(repeatTime) > 1000 * 1.5) {
-                  contentP.style.visibility = 'visible'
-               }
-               // 滚动
-               if (moment().diff(repeatTime) > 1000 * 3) {
-                  contentParent.scrollLeft = contentParent.scrollLeft + 1
-               }
-               // 滚完 重置
-               if (contentParent.scrollLeft >= contentP.clientWidth + 24) {
-                  contentParent.scrollLeft = 0
-                  repeatTime = moment()
-                  setShowContent(content[showIndex.current])
-                  showIndex.current = (showIndex.current + 1) % content.length
-                  contentP.style.visibility = 'hidden'
-               }
-               refreshTime = moment()
+                window.requestAnimationFrame(scroll)
             }
-                let text = null
-                text=window.requestAnimationFrame(scroll)
-                cancel.current=text
-         }
-           window.requestAnimationFrame(scroll)
         }
-      }
-   }, [content,roll])
-   return (
-      <div className="marquee_box" id='marquee_box' style={{ overflow: 'hidden',color:'#F9F9F9' }} >
-         <p style={{ position: 'relative', left: 24 }}>
-            <p id='contentP' style={{ display: 'inline-block', visibility: 'hidden' }}>{showContent}</p>
-            <p id='contentPMakeUp' style={{ width: 0, display: 'inline-block' }}></p>
-         </p>
-      </div>
-   )
+    }, [content, roll])
+    return (
+        <div className="marquee_box" id='marquee_box' style={{ overflow: 'hidden', color: '#F9F9F9' }} >
+            <div style={{ position: 'relative', left: 24 }}>
+                <div id='contentP' style={{ display: 'inline-block', visibility: 'hidden' }}>{showContent}</div>
+                <div id='contentPMakeUp' style={{ width: 0, display: 'inline-block' }}></div>
+            </div>
+        </div>
+    )
 }
 
 export default React.memo(TextScroll)
diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
index 1725163..9c910e6 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
@@ -92,14 +92,20 @@ const VideoPlay = ({
     // 标记萤石操作中，等待ifream返回信息后清空
     const yingshiPrepareRef = useRef(null)
     const playState = useRef(false)  //播放状态
+    const player_ = useRef(null)
 
     useEffect(() => {
         setRoll(false)
-    }, [resolution,]);
+    }, [resolution]);
 
 
     useEffect(() => {
         setResolution(changeData?.hdChecked ? 'hd' : 'sd')
+        if (player) {
+            player.stop().then(() => {
+                player.play({ url: changeData?.hdChecked ? videoObj.playUrlHd : videoObj.playUrlSd })
+            })
+        }
     }, [changeData?.hdChecked])
 
     const changeSelectState = (key) => {
@@ -275,7 +281,6 @@ const VideoPlay = ({
     }, [processDisX])
 
     const createPlay = async () => {
-        console.log(size);
         if (videoObj.type != 'yingshi') {
             try {
                 // const inviteRes = await IotVideoServerRequest.get(VideoServeApi.invite, {
@@ -318,8 +323,8 @@ const VideoPlay = ({
                 id: containerId, // 视频容器ID
                 accessToken: videoObj?.yingshiToken,
                 url: videoObj.playUrlSd,
-                width: size?.width,
-                height: size?.height,
+                width: setupSize('width'),
+                height: setupSize('height'),
                 handleSuccess: () => {  //播放成功
                     setRoll(true)
                     setVideoMask(false)
@@ -330,6 +335,7 @@ const VideoPlay = ({
                 },
             })
             setPlayer(player)
+            player_.current = player
         }
     }
 
@@ -368,52 +374,58 @@ const VideoPlay = ({
         }
     }
 
-    useEffect(async () => {
-        if (!operationRef.current?.fullScreen.select && player) {
-            if (videoObj.type == 'yingshi' && IsSize == 'true') {
-
-            } else {
-                console.log(11111111111);
-                console.log(sizeWh);
-
-                await setSize({ parentWidth: sizeWh?.parentWidth, parentHeight: sizeWh?.parentHeight, width: width || sizeWh?.parentWidth, height: height || sizeWh?.parentHeight })
-                player.reSize(width || sizeWh?.parentWidth, height || sizeWh?.parentHeight)
+    const setupSize = (data) => {
+        if (!operationRef.current?.fullScreen.select) {
+            console.log(sizeWh);
+            let containerWidth = sizeWh?.parentWidth    //容器的宽高和视频的宽高
+            let containerHeight = sizeWh?.parentHeight
+            let videoWidth = width || sizeWh?.width
+            let videoHeight = height || sizeWh?.height
 
+            if (IsSize == 'true') {
+                if (containerWidth >= videoWidth && containerHeight >= videoHeight) {
+                    if (videoHeight / videoWidth >= 0.55 && videoHeight / videoWidth <= 0.57) {
 
+                    } else {
+                        console.warn('宽高不符合尺寸要求，故返回合适的尺寸')
+                        if (videoWidth / 16 > videoHeight / 9) {
+                            videoWidth = (videoHeight / 9) * 16
+                        } else {
+                            videoHeight = (videoWidth / 16) * 9
+                        }
+                    }
+                } else {
+                    console.warn('传递宽高参数有误，请确认容器大小范围内')
+                    if (containerWidth / 16 > containerHeight / 9) {
+                        videoWidth = (containerHeight / 9) * 16
+                    } else {
+                        videoHeight = (containerWidth / 16) * 9
+                    }
+                }
+              
+                if (videoObj.type == 'yingshi' && player) {
+                    player.reSize(videoWidth, videoHeight)
+                }
+            } else {
+                if (videoObj.type == 'yingshi' && player) {
+                    player.reSize(width || sizeWh?.parentWidth, height || sizeWh?.parentHeight)
+                }
             }
+            setSize({ parentWidth: containerWidth, parentHeight: containerHeight, width: videoWidth, height: videoHeight })
+            return data == 'width' ? videoWidth : data == 'height' ? videoHeight : ''
         }
+    }
+
+    useEffect(() => {
+        setupSize()
     }, [sizeWh])
 
-    // useEffect(() => {
-    //     if (IsSize == 'true') {
-    //         console.log(size?.parentWidth >= size?.width && size?.parentHeight >= size?.height);
-    //         if (size?.parentWidth >= size?.width && size?.parentHeight >= size?.height) {
-    //             if (size?.height / size?.width >= 0.55 && size?.height / size?.width <= 0.57) {
-
-    //             } else {
-    //                 console.warn('宽高不符合尺寸要求，故返回合适的尺寸')
-    //                 if (size?.width / 16 > size?.height / 9) {
-    //                     setSize({ ...size, width: (size?.height / 9) * 16, })                       
-    //                 } else {
-    //                     setSize({ ...size, height: (size?.width / 16) * 9 })
-    //                 }
-    //             }
-    //         } else {
-    //             console.warn('传递宽高参数有误，请确认容器大小范围内')
-    //             if (size?.parentWidth / 16 > size?.parentHeight / 9) {
-    //                 setSize({ ...size, width: (size?.parentHeight / 9) * 16, height: size?.parentHeight })                   
-    //             } else {
-    //                 setSize({ ...size, width: size?.parentWidth, height: (size?.parentWidth / 16) * 9 })                   
-    //             }
-    //         }
-    //     }
-    // }, [sizeWh])
     return (
         <>
             <div className="vcmp_videoplay" style={{ width: size?.parentWidth || '100%', height: size?.parentHeight || '100%', backgroundColor: 'black', overflow: 'hidden', display: 'flex', alignItems: 'center', justifyContent: 'center', }}>
                 <div id="vcmp_videoplay" style={{ position: 'relative', height: size?.height || '100%', width: size?.width || '100%', minWidth: 240, minHeight: 135, overflow: 'hidden' }}>
                     {/* 顶部信息 */}
-                    {size?.parentWidth > 320 ? <VideoHeader
+                    <VideoHeader
                         operationState={operationState} changeSelectState={changeSelectState}
                         histroyTime={histroyTime}
                         setoperationState={setoperationState} name={name}
@@ -426,9 +438,8 @@ const VideoPlay = ({
                         player={player}
                         resolution={resolution}
                         playState={playState.current}
-                    /> : ""}
+                    />
                     {/* 视频内容 */}
-
                     {
                         // <iframe
                         //     frameBorder="0"
@@ -446,8 +457,7 @@ const VideoPlay = ({
                         // />
                     }
                     <div id={containerId} style={{ height: '100%', width: '100%', }}></div>
-                    {videoMask ? <div style={{ height: size?.height || '100%', width: size?.width || '100%', minWidth: 400, minHeight: 225, overflow: 'hidden', position: 'absolute', top: '0', left: '0', zIndex: 99, backgroundColor: 'rgba(255,255,255,0.65)' }}>hhktyjr6tyr5</div> : ''}
-
+                    {videoMask ? <div style={{ height: size?.height || '100%', width: size?.width || '100%', minWidth: 400, minHeight: 225, overflow: 'hidden', position: 'absolute', top: '0', left: '0', zIndex: 99, backgroundColor: 'rgba(255,255,255,0.65)' }}></div> : ''}
 
                     {/* 下方操作栏 */}
                     {/* 显示操作功能条件（宽高） */}
diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlayModal.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlayModal.jsx
index e620b4f..8083939 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlayModal.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlayModal.jsx
@@ -20,17 +20,17 @@ const VideoPlayModal = ({ visible, close, videoObj, name }) => {
         >
             <div id="video_local" style={{ width: '100%' }}>
                 <VideoPlay sizeWh={{
-                    width:'',
-                    height: '',
+                    width:918,
+                    height: 460,
                     parentWidth: 918,
                     parentHeight: 460,
                 }}
                     videoObj={videoObj}
                     name={name}
                     height={460}
-                    local={true} 
-                    // IsSize='true' //是否全屏
-                    />
+                    local={true}
+                // IsSize='true' //是否全屏
+                />
             </div>
         </Modal>
     )
diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
index ce04cb2..87296bc 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
@@ -13,6 +13,9 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
     const time = useRef(moment(showTime || undefined))
     const upTimeInterval = useRef(null)
     const [showTime_, setShowTime] = useState('     ')
+
+    console.log(11212111313131);
+
     const updateTime = () => {
         if (!showTime) {
             setShowTime('')
@@ -54,9 +57,12 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
     }, [showTime])
 
     const vcmp_videoplay = document.getElementById('vcmp_videoplay')?.clientHeight
+    const vcmp_videopla = document.getElementById('vcmp_videoplay')?.clientWidth
+    console.log(vcmp_videopla);
+
     return (
         <div>
-            {roll ?
+            {roll && vcmp_videopla > 320 ?
                 <div style={{
                     height: '12%', lineHeight: `${vcmp_videoplay * 0.12 > 42 ? 42 : vcmp_videoplay * 0.12 < 30 ? 30 : vcmp_videoplay * 0.12}px`, background: videoStyle == 'true' ? '#467ACD' : '#00000026', maxHeight: 42, minHeight: 30,
                     position: 'absolute', width: '100%', zIndex: 80,
@@ -86,8 +92,6 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
                                             } else {
                                                 player.play({ url: resolution == 'sd' ? videoObj?.playUrlSd : videoObj?.playUrlHd, })
                                             }
-
-
                                         }} />
                                     </> : ''
                             }
@@ -95,7 +99,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
                         </Col>
                         <Col span={videoStyle == 'true' ? 24 : 15} style={{}}>
                             <div style={{ paddingRight: 12 }}>
-                                {content ? <TextScroll content={content || []} duration={6} /> : ""}
+                                {content ? <TextScroll content={content || []} duration={6} roll={roll} /> : ""}
                             </div>
                         </Col>
                     </Row>
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/application/components/applyModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/application/components/applyModal.jsx
index f8dfe17..a363bb5 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/application/components/applyModal.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/application/components/applyModal.jsx
@@ -19,7 +19,7 @@ const ApplyModal = ({ close, modalName, visible }) => {
     return <Modal
         title={modalName ? "修改应用" : "创建应用"}
         visible={visible}
-        width={610}
+        width={494}
         onCancel={() => close()}
         onOk={handleOk}
     >
@@ -38,12 +38,12 @@ const ApplyModal = ({ close, modalName, visible }) => {
                 allowEmpty={false}
 
                 initValue={'' || ""}
-                placeholder="建议命名方式: [应用名 + 应用场景] 如:智慧昌南-消防，不超过15个字符"
-                style={{ width: 466 }}
+                placeholder="建议命名方式: [应用名 + 应用场景] 不超过15个字符"
+                style={{ width: 350 }}
                 rules={[
                     {
                         required: true,
-                        message: "建议命名方式: [应用名 + 应用场景] 如:智慧昌南-消防，不超过15个字符",
+                        message: "建议命名方式: [应用名 + 应用场景] 不超过15个字符",
                     },
                 ]}
             />
@@ -53,7 +53,7 @@ const ApplyModal = ({ close, modalName, visible }) => {
                 initValue={'' || null}
                 placeholder="请选择应用类型"
                 allowEmpty={false}
-                style={{ width: 150 }}
+                style={{ width: 350 }}
                 rules={[{ required: true, message: "请选择应用类型" }]}
             >
                 {[{ name: 'web', id: 'web' }, { name: 'app', id: 'app' }, { name: '小程序', id: '小程序' }, { name: '其他', id: '其他' }].map((item, index) => (
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
index d1d9204..c4c6a32 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
@@ -181,8 +181,8 @@ function SideSheets (props) {
         <SideSheet
             visible={visible}
             title={cameraSetup ?
-                <><img src={`/assets/images/background/${nvrDetails.forbidden ? "red" : colorStatus(statusNvr ? statusCamera.online : "")}.png`} style={{ marginRight: "10px" }} />污水管理出出口</>
-                : <><img src={`/assets/images/background/${colorStatus(statusCamera ? statusNvr.online : "")}.png`} style={{ marginRight: "10px" }} />智慧设备NVR</>
+                <><img src={`/assets/images/background/${nvrDetails.forbidden ? "red" : colorStatus(statusNvr ? statusCamera.online : "")}.png`} style={{ marginRight: "10px" }} />{nvrDetails?.name}</>
+                : <><img src={`/assets/images/background/${colorStatus(statusCamera ? statusNvr.online : "")}.png`} style={{ marginRight: "10px" }} />{nvrDetails?.name}</>
             }
             style={{ background: "#F9FBFF" }}
             size="large"
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx b/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx
index 3a274cd..3ccc443 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx
@@ -47,6 +47,7 @@ const VideoPlayCross = (props) => {
             window.removeEventListener('resize', resize_);
         }
     }, [])
+    console.log(videoParams);
     return (
         <>
             {
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
index fccf34e..465e79b 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef, useEffect } from "react";
 import { connect } from "react-redux";
-import { Modal, Spin,Input,Collapse ,SideSheet,Tabs, TabPane,Popover} from "@douyinfe/semi-ui";
+import { Modal, Spin,Tag, Space,Collapse ,SideSheet,Tabs, TabPane,Popover} from "@douyinfe/semi-ui";
 import moment from "moment";
 import './pushSideSheet.less'
 import { push } from "react-router-redux";
@@ -13,8 +13,8 @@ function pushSideSheet (props) {
     } = props;
     const { offline } = actions;
     const [logList, setLogList] = useState([]);//日志列表
-    const [noticeTest, setNoticeTest] = useState('');//通知列表
-    const [equipmentTest, setEquipmentTest] = useState();//设备列表
+    const [noticeTest, setNoticeTest] = useState([]);//通知列表
+    const [equipmentTest, setEquipmentTest] = useState([]);//设备列表
     
     //初始化
     useEffect(() => {
@@ -30,7 +30,8 @@ function pushSideSheet (props) {
                     title:getTimeTitle(journal[index].time),
                     time:getTimeData(journal[index].time),
                     cameraList:camerTest,
-                    receiverList:receiverTest
+                    receiverList:receiverTest,
+                    noticeWay:journal[index].noticeWay[0],
                 }
             )
         }
@@ -56,23 +57,21 @@ function pushSideSheet (props) {
         for (let j = 0; j < showList.length; j++) {
             for (let i = 0; i < timeList.length; i++) {
                 if(timeList[i].title==showList[j].title){
-                    showList[j].timeList.push({time:timeList[i].time,cameraList:timeList[i].cameraList,receiverList:timeList[i].receiverList})
+                    showList[j].timeList.push({time:timeList[i].time,cameraList:timeList[i].cameraList,receiverList:timeList[i].receiverList,noticeWay:timeList[i].noticeWay,})
                 }
             }
         }
         setLogList(showList)
-        let noticeList =''
+        let noticeList =[]
         for (let i = 0; i < pushData.cameraStatusPushReceivers.length; i++) {
-            noticeList=noticeList+pushData.cameraStatusPushReceivers[i].receiver+';'
+            noticeList.push(pushData.cameraStatusPushReceivers[i].receiver)
         }
         setNoticeTest(noticeList)
-        
-        let equipmentList=''
+        let equipmentList=[]
         for (let i = 0; i < pushData.cameraStatusPushMonitors.length; i++) {
-            noticeList=noticeList+pushData.cameraStatusPushMonitors[i].camera.name+';'
+            equipmentList.push(pushData.cameraStatusPushMonitors[i].camera.name)
         }
         setEquipmentTest(equipmentList)
-        console.log('pushData',pushData);
     }, []);
     function getTimeTitle(date){
         let year = moment(date).year()+'年'
@@ -94,7 +93,7 @@ function pushSideSheet (props) {
             <SideSheet title={pushData.name} className='sideSheet' width={670} visible={true} onCancel={sideSheetChange}>
                 <Tabs type="line">
                     <TabPane tab="推送日志" itemKey="1">
-                        <Collapse>
+                        <Collapse defaultActiveKey="0">
                         {logList.map((item, index) => {
                         return (
                             <Collapse.Panel header={<div style={{width:'100%',textAlign:'center'}}>{item.title}</div>} itemKey={String(index)}  key={index} >
@@ -116,7 +115,7 @@ function pushSideSheet (props) {
                                             }>
                                                 <div style={{marginRight:24,width:133,textOverflow:'ellipsis',whiteSpace:'nowrap',overflow:'hidden'}}>{itm.cameraList}</div>
                                             </Popover>
-                                            <div style={{marginRight:25,width:83}} className='online' >上线及时通知</div>
+                                            <div style={{marginRight:25,width:83}} className={itm.noticeWay=='online'?'online':itm.noticeWay=='offline'?'offline':'timing'}>{itm.noticeWay=='online'?'上线及时通知':itm.noticeWay=='offline'?'离线即时通知':'24时定时统计'}</div>
                                         </div>
                                     )
                                 })}
@@ -129,9 +128,17 @@ function pushSideSheet (props) {
                             <img
                                 src="/assets/images/background/icon_camera.png"
                                 alt="设置"
-                                style={{ width: 24, height: 24 }}
+                                style={{ width: 26, height: 26 }}
                             />
-                            <div>{equipmentTest}</div>
+                            <div style={{marginTop:1,background: '#F1F5FF',padding:14,minHeight:139}}>
+                                <Space wrap>
+                                    {equipmentTest.map((item, index) => {
+                                        return(
+                                        <Tag color='blue' style={{height:33}} type='solid' key={index}>{item}</Tag>
+                                        )
+                                    })}
+                                </Space>
+                            </div>
                         </div>
                     </TabPane>
                     <TabPane tab="接收信息" itemKey="3">
@@ -139,9 +146,17 @@ function pushSideSheet (props) {
                             <img
                                 src={pushData.pushWay=='email'?"/assets/images/background/icon_email.png":"/assets/images/background/icon_phone.png"}
                                 alt="设置"
-                                style={{ width: 24, height: 24 }}
+                                style={{ width: 26, height: 26 }}
                             />
-                            <div>{noticeTest}</div>
+                            <div style={{marginTop:1,background: '#F1F5FF',padding:14,minHeight:139}}>
+                                <Space wrap>
+                                    {noticeTest.map((item, index) => {
+                                        return(
+                                        <Tag color='blue' style={{height:33}} type='solid' key={index}>{item}</Tag>
+                                        )
+                                    })}
+                                </Space>
+                            </div>
                         </div>
                     </TabPane>
                 </Tabs>
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
index a28a636..2256ce0 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
@@ -198,7 +198,12 @@ const Carrierpigeon = (props) => {
                         </Button>
                         <Button onClick={()=>{
                             dispatch(offline.getPushLog(row.id)).then((res) => {
-                                setJournal(res.payload.data);
+                                if(res.success){
+                                    setJournal(res.payload.data);
+                                }
+                                else{
+                                    setJournal([]);
+                                }
                                 setPushData(row);
                                 setSideSheetVisible(true);
                             });