Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

@@ -3079,7 +3079,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                             return;
                             return;
                         }
                         }
                         //url(/src/style/img/shutdown.png)
                         //url(/src/style/img/shutdown.png)
-                        title +=`<span id="title-shutdown" data-id=${resId} style="padding:0 5px;display: inline-block;position: relative;top: 8px;left:20px;"></span>`
+                        title +=`<span id="title-shutdown" data-id=${resId} style="padding:0 5px;width:600px;display: inline-block;position: relative;top: 0px;left:20px;"></span>`
                         obj.openNewWin(url, title, params, editFlag, fn, cancelfn, type,sign_);
                         obj.openNewWin(url, title, params, editFlag, fn, cancelfn, type,sign_);
                     },
                     },
                     error: function () {
                     error: function () {
@@ -3360,17 +3360,24 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                                     //
                                     //
                                     let carouselStr=`
                                     let carouselStr=`
                                         <img src="/src/style/img/shutdown.png" style="position: absolute;top: 0; left: -3px;" alt="">
                                         <img src="/src/style/img/shutdown.png" style="position: absolute;top: 0; left: -3px;" alt="">
-                                        <div class="layui-carousel shutdown-carousel " id="shutdown-carousel" style="background: transparent;">
-                                                        <div carousel-item>`;
+                                        <div  style="background: transparent;    height: 30px;font-size: 14px; color:#ff0000;   display: flex;align-items: center;">
+                                                        <marquee id="marqueeDiv" behavior="scroll" direction="left" scrollamount="10" >`;
                                     let boxShadow='0 0 10px';
                                     let boxShadow='0 0 10px';
                                     listData.map((item,index)=>{
                                     listData.map((item,index)=>{
-                                        carouselStr+=` <div class="layui-row layui-col-space10" style="background: transparent;position: relative;" >
+                                        carouselStr+=item;
+                                      /*  carouselStr+=` <div class="layui-row layui-col-space10" style="background: transparent;position: relative;" >
                                                     <span style="font-size: 14px;color:#ff0000;padding:0 5px; height:30px;width:100%;position: absolute;top:0;left:0;right:0;">`+item+`</span>
                                                     <span style="font-size: 14px;color:#ff0000;padding:0 5px; height:30px;width:100%;position: absolute;top:0;left:0;right:0;">`+item+`</span>
-                                                 </div>`;
+                                                 </div>`;*/
                                     })
                                     })
-                                    carouselStr+=` </div></div>`;
+                                    carouselStr+=` </marquee></div>`;
                                     $('.layui-layer-title #title-shutdown').append(carouselStr);
                                     $('.layui-layer-title #title-shutdown').append(carouselStr);
-                                    //轮播切换
+                                    $("#marqueeDiv").mouseenter(function (){
+                                        this.stop();
+                                    })
+                                    $("#marqueeDiv").mouseout(function (){
+                                        this.start();
+                                    })
+                                    /*//轮播切换
                                     let options={
                                     let options={
                                         width: '630px'
                                         width: '630px'
                                         , height:'30px'
                                         , height:'30px'
@@ -3386,7 +3393,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                                         elem: '#shutdown-carousel'
                                         elem: '#shutdown-carousel'
                                     });
                                     });
                                     //重置轮播
                                     //重置轮播
-                                    ins.reload(options);
+                                    ins.reload(options);*/
                                     //end lsq 2022-05-24
                                     //end lsq 2022-05-24
                                 }
                                 }
                             }
                             }