Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-xwx

@@ -276,6 +276,27 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 }
             });
         },
+        //文件预览
+        fileviewer: function(filepath){
+            var accessToken = '';
+            layui.use(['sessions', 'common'], function () {
+                var sessions = layui.sessions;
+                accessToken = sessions.getToken()['access_token'];
+            });
+            var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}`+'&access_token=' + accessToken;
+            var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
+            $.ajax({
+                type: "get",
+                url: url,
+                async: true,
+                success: function (data) {
+                    if (data.code == 0) {
+                        layer.close(loadIndex);
+                        window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.str));
+                    }
+                }
+            });
+        },
         //业务下拉选择数据绑定
         bizTypeSelect: function (targtetId, callback) {
             var options = "<option value=''>=所属业务=</option>";

@@ -132,8 +132,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
             })
             return false
         };
-
+        var deviceSaveCount = 0;
         $("#device_card :button#device_create").on("click", function () {
+            if(deviceSaveCount>0){
+                layer.msg('请先保存一条再新增', {
+                    icon: 7, time: 3000
+                });
+                return
+            }
+            deviceSaveCount+=1;
             var html = "<tr><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'/></td><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'/></td><td><input type='text' class='layui-input' width='40px'  lay-verify = 'required'/></td><td><input type='text' width='40px'  class='layui-input' lay-verify = 'required'/></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 18px'/></td></tr>"
             $("#device-table").append(html);
 
@@ -150,6 +157,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                                 icon: 7, time: 3000
                             });
                             tdArr = [];
+                            deviceSaveCount-=1;
                             $(this).closest('tr').remove();
                             return;
                         }
@@ -182,12 +190,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                             'deviceModel': tdArr[2],
                             'brand': tdArr[3]
                         }
+                        deviceSaveCount-=1;
                         devicesBak.push(deviceObj)
                     }
                 }
             });
         });
+        var fittingSaveCount =0;
         $("#fiting_card :button#fiting_create").on("click", function () {
+            if(fittingSaveCount>0){
+                layer.msg('请先保存一条再新增', {
+                    icon: 7, time: 3000
+                });
+                return
+            }
+            fittingSaveCount+=1;
             var html = "<tr><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'></td><td><input type='text' class='layui-input' width='50px'  lay-verify = 'required'></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 18px'/></td></tr>"
             $("#fiting-table").append(html);
 
@@ -203,6 +220,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                                 icon: 7, time: 3000
                             });
                             tdArr = [];
+                            fittingSaveCount-=1;
                             $(this).closest('tr').remove();
                             return;
                         }
@@ -228,6 +246,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                             'fittingName': tdArr[2],
                             'deviceModel': tdArr[3]
                         }
+                        fittingSaveCount-=1;
                         fittingsBak.push(fittingObj)
                     }
                 }

@@ -57,7 +57,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     },
                     {
                         title: '操作', align: "center", width: 120,
-                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link preview-attachment-btn">预览</span>' +
+                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" data-path="{{d.path}}" class="layui-table-link preview-attachment-btn">预览</span>' +
                             '<span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link attachment-download-btn" style="margin-left: 10px">下载</span></div>'
                     }
                 ]],
@@ -65,6 +65,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     $('.preview-attachment-btn').on('click', function () {
                         var id = $(this).data('id')
                         var suffix = $(this).data('suffix')
+                        var filepath = $(this).data('path')
                         if (suffix == 'jpg' || suffix == 'png' || suffix == 'JPG' || suffix == 'PNG') { //图片类型
                             var srcUrl = domainName + `/api-web/openoffice/readImage/${id}?access_token=` + accessToken
                             layer.open({
@@ -75,7 +76,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                             })
                         } else {
                             //附件为文档类型
-                            common.openReport(id)
+                            common.fileviewer(filepath)
                         }
                     })
 

@@ -94,9 +94,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
             })
             return false;
         }
-
+        var saveCount =0;
         $("#routeAdjustDetail_create").on("click", function () {
             routeAdjustDetailId += 1;
+            if(saveCount>0){
+                layer.msg('请先保存一条再新增', {
+                    icon: 7, time: 3000
+                });
+                return
+            }
+            saveCount+=1;
             var html = "<tr><td id='" + routeAdjustDetailId + "'><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' class='layui-input' width='50px'  lay-verify = 'required|phone'></td><td><input type='text' width='50px'  class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required|phone'></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 16px'/></td></tr>"
             $("#routeAdjustDetail-table").append(html);
 
@@ -114,6 +121,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                                 icon: 7, time: 3000
                             });
                             tdArr = [];
+                            saveCount-=1;
                             $(this).closest('tr').remove();
                             return;
                         }
@@ -154,12 +162,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                         if (tdArr[4] != '' && tdArr[4] != undefined) {
                             var resdata = commonDetail.validatorPhone(tdArr[4]);
                             if (resdata.code == -1) {
-                                layer.msg(resdata.msg, {
-                                    icon: 7, time: 3000
-                                });
+                                layer.confirm(resdata.msg+'确认要删除吗？', {
+                                    icon: 3, yes: function (index, layero) {
+                                        layer.load(2);
                                         tdArr = [];
-                                $(this).closest('tr').remove();
-                                return;
+                                        adjustObj ={};
+                                        tr.remove();
+                                        layer.closeAll('loading');
+                                        layer.close(index)
+                                        return
+                                    }, cancel: function (index, layero) {
+                                        adjustObj.localPhone = tdArr[4]
+                                        layer.close(index);
+                                    }
+                                });
                             } else {
                                 adjustObj.localPhone = tdArr[4]
                             }
@@ -167,17 +183,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                         if (tdArr[8] != '' && tdArr[8] != undefined) {
                             var resdata = commonDetail.validatorPhone(tdArr[8]);
                             if (resdata.code == -1) {
+                                layer.confirm(resdata.msg+'确认要删除吗？', {
+                                    icon: 3, yes: function (index, layero) {
+                                        layer.load(2);
+                                        tdArr = [];
+                                        adjustObj ={};
+                                        tr.remove();
+                                        layer.closeAll('loading');
+                                        layer.close(index)
 
-                                layer.msg(resdata.msg, {
-                                    icon: 7, time: 3000
+                                        return
+                                    }, cancel: function (index, layero) {
+                                        adjustObj.targetPhone = tdArr[8]
+                                        layer.close(index);
+                                    }
                                 });
-                                tdArr = [];
-                                $(this).closest('tr').remove();
-                                return;
                             } else {
                                 adjustObj.targetPhone = tdArr[8]
                             }
                         }
+                        saveCount-=1;
                         adjustBak.push(adjustObj)
                     }
                 }

@@ -57,7 +57,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     },
                     {
                         title: '操作', align: "center", width: 120,
-                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link preview-attachment-btn">预览</span>' +
+                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" data-path="{{d.path}}" class="layui-table-link preview-attachment-btn">预览</span>' +
                             '<span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link attachment-download-btn" style="margin-left: 10px">下载</span></div>'
                     }
                 ]],
@@ -65,6 +65,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     $('.preview-attachment-btn').on('click', function () {
                         var id = $(this).data('id')
                         var suffix = $(this).data('suffix')
+                        var filepath = $(this).data('path')
                         if (suffix == 'jpg' || suffix == 'png' || suffix == 'JPG' || suffix == 'PNG') { //图片类型
                             var srcUrl = domainName + `/api-web/openoffice/readImage/${id}?access_token=` + accessToken
                             layer.open({
@@ -75,7 +76,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                             })
                         } else {
                             //附件为文档类型
-                            common.openReport(id)
+                            common.fileviewer(filepath)
                         }
                     })
 

@@ -126,6 +126,10 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
                         },
                         data: res.data
                     })
+                    if(settingOrgSelect){
+                        //追加样式
+                        $('#settingOrgId').find('.xm-body').eq(0).css("width","230px");
+                    }
                 }
             })
         }

@@ -77,7 +77,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
             })
             return false
         }
+        var saveCount =0;
         $("#identifying_create").on("click",function () {
+            if(saveCount>0){
+                layer.msg('请先保存一条再新增', {
+                    icon: 7, time: 3000
+                });
+                return
+            }
+            saveCount+=1;
             var html = "<tr><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' class='layui-input' width='50px'  lay-verify = 'required|phone'></td><td><input type='text' width='50px'  class='layui-input' lay-verify = 'required|identify'></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 16px'/></td></tr>"
             $("#identifying-table").append(html);
 
@@ -94,6 +102,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                                 icon: 7, time: 3000
                             });
                             tdArr = [];
+                            saveCount-=1;
                             $(this).closest('tr').remove();
                             return;
                         }
@@ -106,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                             console.log(name);
                             if (name != '' && name != undefined) {
                                 for (let i = 0; i < staffsBak.length; i++) {
-                                    if (staffsBak[i].name == name) {
+                                    if (staffsBak[i].userName == name) {
                                         staffsBak.pop(staffsBak[i]);
                                     }
                                 }
@@ -133,6 +142,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                                             tr.remove();
                                             layer.closeAll('loading');
                                             layer.close(index)
+
                                             return
                                         }, cancel: function (index, layero) {
                                             staffObj.phone = tdArr[1]
@@ -153,6 +163,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                                     tr.remove();
                                     layer.closeAll('loading');
                                     layer.close(index);
+
                                     return
                                 },cancel: function (index, layero) {
                                     staffObj.idCard = tdArr[2]
@@ -163,6 +174,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                                 staffObj.idCard = tdArr[2]
                             }
                         }
+                        saveCount-=1;
                         if(staffObj.phone && staffObj.idCard) {
                             staffsBak.push(staffObj)
                         }

@@ -111,7 +111,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     },
                     {
                         title: '操作', align: "center", width: 120,
-                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link preview-attachment-btn">预览</span>' +
+                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" data-path="{{d.path}}" class="layui-table-link preview-attachment-btn">预览</span>' +
                             '<span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link attachment-download-btn" style="margin-left: 10px">下载</span></div>'
                     }
                 ]],
@@ -119,6 +119,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     $('.preview-attachment-btn').on('click', function () {
                         var id = $(this).data('id')
                         var suffix = $(this).data('suffix')
+                       var filepath = $(this).data('path')
                         if (suffix == 'jpg' || suffix == 'png' || suffix == 'JPG' || suffix == 'PNG') { //图片类型
                             var srcUrl = domainName + `/api-web/openoffice/readImage/${id}?access_token=` + accessToken
                             layer.open({
@@ -129,7 +130,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                             })
                         } else {
                             //附件为文档类型
-                            common.openReport(id)
+                            common.fileviewer(filepath);
                         }
                     })
 

@@ -113,7 +113,7 @@ layui.extend({
         try {
             let el = admin.tabsPage.elem;
             if(el && el.attr('lay-href-type')){
-                if(el.attr('lay-href-type') == 'menu'){
+                if(el.attr('lay-href-type') == 'menu' && !matchTo){
                     tabName=  admin.tabsPage.elem.text()
                 }
             }

@@ -128,7 +128,10 @@
     display: flex;
     align-items: center;
     font-size: 12px;
-    justify-content: end;
+    justify-content: flex-end;
+}
+.range-padding-right{
+    padding-right: 100px;
 }
 .pie-date-range{
     flex:1;

 <el-row class="dataRange-container">
     <el-col :span="24">
         <div class="tabs-div date-flex-div-around">
-            <el-col :span="24" class="select-div-flex">
+            <el-col :span="24" class="select-div-flex range-padding-right">
                 时间范围：<el-date-picker
                         class="picker-div"
                         v-model="dateValue"

@@ -276,6 +276,27 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 }
             });
         },
+        //文件预览
+        fileviewer: function(filepath){
+            var accessToken = '';
+            layui.use(['sessions', 'common'], function () {
+                var sessions = layui.sessions;
+                accessToken = sessions.getToken()['access_token'];
+            });
+            var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}`+'&access_token=' + accessToken;
+            var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
+            $.ajax({
+                type: "get",
+                url: url,
+                async: true,
+                success: function (data) {
+                    if (data.code == 0){
+                        layer.close(loadIndex);
+                        window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.str));
+                    }
+                }
+            });
+        },
         //业务下拉选择数据绑定
         bizTypeSelect: function (targtetId, callback) {
             var options = "<option value=''>=所属业务=</option>";

@@ -29,9 +29,47 @@ export default {
 
             })
         }
+        // 获取资源详情 //start lsq 监听跨域iframe子页面向父页面发送数据(子页面点击名称进入详情页) 2022-03-15
+        let getResDetail=(resId)=>{
+            let editFlag = false;
+            let provider = '';
+            let name = '';
+            let ip = '';
+            let resTypeName = '';
+            let adminName = '';
+            let manageIp = '';
+            let collProtocol = '';
+            let resType='';
+            let lyaui=window.parent.layui;
+            proxy.$http.get(`/api-web/v32/res/detail/${resId}`, {}, function (res) {
+                if (res && res.map) {
+                    let data = res.map;
+                    provider = data.provider;
+                    ip = data.ip;
+                    resTypeName = data.resTypeName;
+                    adminName = data.adminName;
+                    manageIp = data.manageIp;
+                    collProtocol = data.collProtocol;
+                    name = data.resName;
+                    if(resType == ''){
+                        resType = data.resType;
+                    }
+                    lyaui.commonCols.detailPage(resId, resType, editFlag, provider, name, ip, resTypeName, adminName, manageIp, collProtocol);
+                }
+            });
+        }
+        //end lsq 2022-03-15
         // 挂载完
         Vue.onMounted(() => {
             getUrl();
+            //start lsq 监听跨域iframe子页面向父页面发送数据(子页面点击名称进入详情页) 2022-03-15
+            window.addEventListener('message',function(e){
+                if(e.data.type=='detail'){
+                    getResDetail(e.data.data.resId);
+                }else{
+                }
+            })
+            //end lsq 2022-03-15
         })
 
         return {