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

@@ -20,7 +20,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
         commonDetail.bindTips();
 
         //基本信息
-        var jbxxKpiId = 'KPI282685A0,KPI2D507904,KPI5858832B,KPIBB1082BE,KPI4419E8A1';
+        //2021-12-30 网神防火墙详情页，基本信息屏蔽指标：KPIBB1082BE  腾飞采集不到
+        var jbxxKpiId = 'KPI282685A0,KPI2D507904,KPI5858832B,KPI4419E8A1';
 
         //接口信息kpiids
         var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB28E7495,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPI7D3D3496,KPICFEE28E9';

@@ -469,7 +469,7 @@ layui.extend({
                         new msgTips({
                             dom: ".right-bottom-tips",
                             title: title,
-                            message: `<p style="line-height: 20px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding-left: 25px;padding-top: 145px;" ><span style=" overflow: hidden;   text-overflow: ellipsis;   display: -webkit-box;  -webkit-line-clamp: 5; -webkit-box-orient: vertical;margin-left: -11px;" lay-tips="${content}">${content}</span><span class="title closeFault" style="position: absolute;top: 72px;left: 213px;">X</span><span style="position: absolute;left: 87px;top: 124px; font-weight: bold;float: right;">${title}</span></p>`,
+                            message: `<p style="line-height: 18px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding: 145px 22px 0; "><span style=" overflow: hidden;   text-overflow: ellipsis;   display: -webkit-box;  -webkit-line-clamp: 4; -webkit-box-orient: vertical;" lay-tips="${content}">${content}</span><span class="title closeFault" style="position: absolute;top: 66px;left: 214px;">X</span><span style="position: absolute;left: 87px;top: 124px; font-weight: bold;float: right;">${title}</span></p>`,
                             duration: 10000,
                             space: 10,
                             firstSpace: 8,
@@ -487,6 +487,7 @@ layui.extend({
                                 //}
                             }
                         })
+                        debugger
                     }, delay);
                 }else{
                     setTimeout(function () {

@@ -127,7 +127,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
                 $(newContainer).css({
                     'transition-timing-function':options.timingFun,
                     // 'width':options.width,
-                    'width':'226px',
+                    'width':'240px',
                     'bottom':'350px'
                 });
                 var height = $(newContainer).outerHeight(true);

@@ -386,7 +386,7 @@ export default {
 
             let url = `/inspection-report/file/change`;
             let msg = "您确认将该文件放入回收站？";
-            if (props.isRecycle) {
+            if (props.isRecycle||props.isView) {
                 msg = "您确认永久删除该文件？";
                 url = `/inspection-report/file/delete`;
             }
@@ -415,7 +415,7 @@ export default {
                     if (res && res.code == 0) {
                         // 执行回调，获取文件id列表
                         if(res.data){
-                            emit('deleteCallback',res.data);
+                            emit('deletecallback', res.data);
                         }
 
                         if (res.msg) {

@@ -4,6 +4,6 @@
              :types="[docType]"
              :fileIds="docIds"
              :canAddFolder="canAddFolder"
-             @deleteCallback="delDocRel"
+             @deletecallback="delDocRel"
              @callback="saveOpsLog"></cm-document>
 

@@ -69,6 +69,19 @@ export default {
                 initFlg.value = true;
             })
         }
+        /**
+         * 文档删除的回调
+         * @param docIds 文档id集合
+         */
+        let delDocRel = (docIds) => {
+            console.log("delDocRel",docIds)
+            let param={
+                id:docIds.join(','),
+            }
+            proxy.$http.get('/api-web/bOpsFile/deleteSearch',param, function (res){
+
+            })
+        }
 
         let saveOpsLog = ({document, fileInfo}) => {
             let params = {
@@ -88,13 +101,7 @@ export default {
             });
         }
 
-        /**
-         * 文档删除的回调
-         * @param docIds 文档id集合
-         */
-        let delDocRel = (docIds) => {
-            //
-        }
+
 
         // 监听编辑状态
         Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {