Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -661,7 +661,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                             if(res.data && res.data.length > 0){
                             if(res.data && res.data.length > 0){
                                 $.each(res.data,function (i,v){
                                 $.each(res.data,function (i,v){
                                     trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
                                     trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
-                                                        <td>${v.resTypeName}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
+                                                        <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
                                 });
                                 });
                             }
                             }
 
 
@@ -677,7 +677,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                         var trs = '';
                         var trs = '';
                         $.each(res.data,function (i,v){
                         $.each(res.data,function (i,v){
                             trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
                             trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
-                                        <td>${v.resTypeName}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
+                                        <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
                         });
                         });
                         var tb = `
                         var tb = `
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form">
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form">
@@ -685,7 +685,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                 <div class="layui-inline">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline layui-input-inline--long">
                                     <div class="layui-input-inline layui-input-inline--long">
                                         <input type="text" id="condition-resType-keyword" placeholder="输入名称，回车搜索" autocomplete="off"
                                         <input type="text" id="condition-resType-keyword" placeholder="输入名称，回车搜索" autocomplete="off"
-                                           lay-tips="关键字检索包含： </br>IP地址</br>资源名称</br>负责人"
+                                           lay-tips="关键字检索包含： </br>IP地址</br>资源名称</br>负责人</br>采集协议"
                                            class="layui-input">
                                            class="layui-input">
                                     </div>
                                     </div>
                                     <div class="layui-input-inline layui-input-inline--long multi-query" id="dyglResListBusType">
                                     <div class="layui-input-inline layui-input-inline--long multi-query" id="dyglResListBusType">
@@ -699,7 +699,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                         
                         
                           <table class="layui-table">
                           <table class="layui-table">
                             <thead>
                             <thead>
-                              <tr> <th>序号</th><th>资源名称</th><th>IP地址</th><th>负责人</th><th>资源类型</th><th>操作</th></tr> 
+                              <tr> <th>序号</th><th>资源名称</th><th>IP地址</th><th>负责人</th><th>资源类型</th><th>采集协议</th><th>操作</th></tr> 
                             </thead>
                             </thead>
                             <tbody> ${trs} </tbody>
                             <tbody> ${trs} </tbody>
                           </table>
                           </table>

@@ -458,20 +458,16 @@ layui.extend({
                         imgUrl="/src/style/img/fault.png";
                         imgUrl="/src/style/img/fault.png";
                     }
                     }
                     if(toastType=='faultprogress'){
                     if(toastType=='faultprogress'){
-                        imgUrl="/src/style/img/faultprogress.png";
+                        imgUrl="/src/style/img/faultover.png";
                     }
                     }
                     if(toastType=='faultover'){
                     if(toastType=='faultover'){
-                        imgUrl="/src/style/img/faultover.png";
+                        imgUrl="/src/style/img/faultprogress.png";
                     }
                     }
                     setTimeout(function () {
                     setTimeout(function () {
                         new msgTips({
                         new msgTips({
                             dom: ".right-bottom-tips",
                             dom: ".right-bottom-tips",
                             title: title,
                             title: title,
-                            message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;padding: 10px;background-position-x: right;padding-left: 29px;padding-top: 145px;">
-                                            <span class="title closeFault" style="position: relative;top: -75px;left: 170px;">X</span>
-                                            <span style="position: relative;left: 35px;top: -21px; font-weight: bold;">${title}</span>
-                                            ${content}
-                                      </p>`,
+                            message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding-left: 25px;padding-top: 145px;"><span >${content}</span><span class="title closeFault" style="position: relative;top: -126px;left: 22px;">X</span><span style="position: relative;left: -89px;top: -96px; font-weight: bold;float: right;">${title}</span></p>`,
                             duration: 10000,
                             duration: 10000,
                             space: 10,
                             space: 10,
                             firstSpace: 8,
                             firstSpace: 8,
@@ -489,7 +485,6 @@ layui.extend({
                                 //}
                                 //}
                             }
                             }
                         })
                         })
-
                     }, delay);
                     }, delay);
                 }else{
                 }else{
                     setTimeout(function () {
                     setTimeout(function () {

@@ -98,7 +98,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
             $(options.dom).append(newContainer);
             $(options.dom).append(newContainer);
         } else if(options.toastType=='faultinfo'||options.toastType=='faultprogress'||options.toastType=='faultover'){
         } else if(options.toastType=='faultinfo'||options.toastType=='faultprogress'||options.toastType=='faultover'){
 
 
-            var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%);width: 226px;bottom: 8px !important; ></div>"
+            var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%); ></div>"
 
 
             // var head = "<div class='faultTitle faultClearfix'><i class='faultTips_icon_l fl'></i><i class='FaultTips_icon_r close'></i></div>";
             // var head = "<div class='faultTitle faultClearfix'><i class='faultTips_icon_l fl'></i><i class='FaultTips_icon_r close'></i></div>";
             var head = "";
             var head = "";
@@ -127,7 +127,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
                     'transition-timing-function':options.timingFun,
                     'transition-timing-function':options.timingFun,
                     // 'width':options.width,
                     // 'width':options.width,
                     'width':'226px',
                     'width':'226px',
-                    'bottom':'8px'
+                    'bottom':'620px'
                 });
                 });
                 var height = $(newContainer).outerHeight(true);
                 var height = $(newContainer).outerHeight(true);
                 var len = $('.fault_ez_tips').size();
                 var len = $('.fault_ez_tips').size();

@@ -46,7 +46,7 @@
             <!--判定是否有daping角色，如果有则显示该菜单 joke add 20211203-->
             <!--判定是否有daping角色，如果有则显示该菜单 joke add 20211203-->
             <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-user/users/checkHasRole?roleCode=daping">
             <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-user/users/checkHasRole?roleCode=daping">
                 {{# if(d.count > 0){  }}
                 {{# if(d.count > 0){  }}
-                <li class="layui-nav-item" lay-tips="监控一体化视图">
+                <li class="layui-nav-item" lay-tips="展示大屏">
                     <a href="javascript:;" layadmin-event="toBigScreen" ><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px"></a>
                     <a href="javascript:;" layadmin-event="toBigScreen" ><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px"></a>
                 </li>
                 </li>
                 {{# } }}
                 {{# } }}

@@ -94,15 +94,19 @@ export default {
                 proxy.$global.showMsg("资源编号不存在，请确认！", "warning")
                 proxy.$global.showMsg("资源编号不存在，请确认！", "warning")
                 return;
                 return;
             }
             }
-
-            proxy.$http.post(`/api-web/favorites/save/res?favId=${favIds.value}&resIds=${props.resId}`, {}, function (res) {
-                if (res && res.code ==0) {
-                    let msg = !res.msg ? '收藏成功！' : res.msg;
-                    let type = !res.success ? 'warning' : 'success';
-                    proxy.$global.showMsg(msg,type);
-                    showDialog(false);
-                }
-            });
+            if (favIds.value != '' && favIds.value != null) {
+
+                proxy.$http.post(`/api-web/favorites/save/res?favId=${favIds.value}&resIds=${props.resId}`, {}, function (res) {
+                    if (res && res.code == 0) {
+                        let msg = !res.msg ? '收藏成功！' : res.msg;
+                        let type = !res.success ? 'warning' : 'success';
+                        proxy.$global.showMsg(msg, type);
+                        showDialog(false);
+                    }
+                });
+            }else {
+                proxy.$global.showMsg('请选择收藏夹', 'warning');
+            }
         }
         }
 
 
 
 

@@ -59,7 +59,7 @@ export default {
             setInterval(function(){
             setInterval(function(){
                 getDateTime();
                 getDateTime();
             },1000);
             },1000);
-            document.title = '监控一体化视图'
+            document.title = '展示大屏'
 
 
         })
         })
         let getDateTime=()=>{
         let getDateTime=()=>{