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

…eb into master-500-dev-xwx

+layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], function (exports) {
+    var $ = layui.$;
+    var view = layui.view;
+    var table = layui.table;
+    var common = layui.common;
+    var laydate = layui.laydate;
+    var admin = layui.admin;
+
+    //对外暴露的接口
+    exports('onlineUser', function () {
+        var sessions = layui.sessions;
+        var accessToken = sessions.getToken().access_token;
+        var loginLog = "";
+        var cols =  [{field: 'loginTime', title: '登录时间', align: 'center'}
+            , {field: 'loginIp', title: 'IP地址', align: 'center'}
+            , {field: 'nickname', title: '登录用户', align: 'center'}
+            , {field: 'orgName', title: '所属部门', align: 'center'}];
+
+        loginLogTable();
+        function loginLogTable() {
+            loginLog = table.render({
+                elem: '#onlineUserTable'
+                , height: 'full-auto'
+                , cellMinWidth: 0
+                , page: 1
+                , limit: 10
+                , url: common.domainName + '/api-log/sysLogin/findLogUser?access_token='+accessToken
+                , cols: [cols]
+                , done: function (res, curr, count) {
+                }
+            });
+        }
+
+        //刷新表格
+        function reloadTable() {
+            loginLog.reload({
+                page: {
+                    curr: 1
+                }
+                , where: {
+                    access_token: accessToken,
+                    username: $("#loginAccount").val(),
+                    startTime: $("#loginLogStartdate").val(),
+                    endTime: $("#loginLogEnddate").val(),
+                    mark: $("#loginLonMark").val(),
+                    orgIds: settingOrgSelect.getValue("valueStr")
+                }
+            });
+        }
+    });
+});

@@ -41,11 +41,14 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
                         url = common.domainName +'/api-log/sysLogin/findLogPage?access_token='+accessToken
                         url = common.domainName +'/api-log/sysLogin/findLogPage?access_token='+accessToken
                         loginLogTable()
                         loginLogTable()
                         $("#loginUserNum").unbind("click").on('click', function () {
                         $("#loginUserNum").unbind("click").on('click', function () {
-                            $("#loginLonMark").val("mark")
-                            $("#loginAccount").val(""),
-                                $("#loginLogStartdate").val(""),
-                                $("#loginLogEnddate").val(""),
-                                reloadTable();
+                            // $("#loginLonMark").val("mark")
+                            // $("#loginAccount").val(""),
+                            //     $("#loginLogStartdate").val(""),
+                            //     $("#loginLogEnddate").val(""),
+                            //     reloadTable();
+                            common.openWin('setting/onlineUser', '在线用户', {}, [], function f() {
+
+                            },null,['60%', '45%']);
                         })
                         })
                     } else {
                     } else {
                         $("#generalUserHeader").show();
                         $("#generalUserHeader").show();
@@ -213,4 +216,4 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
             });
             });
         }
         }
     });
     });
-});
+});

+<div class="layui-card-body">
+    <table id="onlineUserTable"></table>
+</div>
+<style>
+
+</style>
+<script>
+    layui.use('onlineUser', function (fn) {
+        fn({{d}})
+    })
+</script>

@@ -12,11 +12,11 @@
                 <el-tree ref="tree" style="padding:6px;" :props="props" :data="treeData" node-key="id"
                 <el-tree ref="tree" style="padding:6px;" :props="props" :data="treeData" node-key="id"
                          :expand-on-click-node="false" :expand-on-click-node="true" :default-expanded-keys="defaultExpandedKeys">
                          :expand-on-click-node="false" :expand-on-click-node="true" :default-expanded-keys="defaultExpandedKeys">
                     <template #default="{ node, data }">
                     <template #default="{ node, data }">
-                        <div style="display: flex;flex-direction: row;width: 100%;">
-                            <div :style="{'width':isAdmin() ? 'calc(100% - 85px)':'100%','max-width':isAdmin() ? 'calc(100% - 85px)':'100%'}" style="overflow: hidden;text-overflow: ellipsis;text-align: left;" @click="nodeClick(node, data)" :title="node.label">
+                        <div style="display: flex;flex-direction: row;flex: 1;overflow: hidden">
+                            <div style="overflow: hidden;text-overflow: ellipsis;text-align: left;flex:1" @click="nodeClick(node, data)" :title="node.label">
                                 {{node.label }}
                                 {{node.label }}
                             </div>
                             </div>
-                            <div  v-if="isAdmin()" :style="{'width':isAdmin()?'60px':'0px'}">
+                            <div  v-if="isAdmin()" :style="{'width':isAdmin()?'70px':'0px'}">
                                 <a @click="editType(data)" v-if="!data.root" style="margin-right: 10px;">
                                 <a @click="editType(data)" v-if="!data.root" style="margin-right: 10px;">
                                     <i class="el-icon-edit"></i>
                                     <i class="el-icon-edit"></i>
                                 </a>
                                 </a>
@@ -184,15 +184,15 @@
                     <el-input :size="$global.elementSize" v-model="docForm.name" clearable ></el-input>
                     <el-input :size="$global.elementSize" v-model="docForm.name" clearable ></el-input>
                 </el-form-item>
                 </el-form-item>
 
 
-               <!-- <div v-if="!isUserFolder">
-                    <el-form-item label="文档编号" prop="docNo">
-                        <el-input :size="$global.elementSize" v-model="docForm.docNo" clearable></el-input>
-                    </el-form-item>
+                <!-- <div v-if="!isUserFolder">
+                     <el-form-item label="文档编号" prop="docNo">
+                         <el-input :size="$global.elementSize" v-model="docForm.docNo" clearable></el-input>
+                     </el-form-item>
 
 
-                    <el-form-item label="文档类型" prop="type">
-                        <el-input :size="$global.elementSize" v-model="docForm.type" clearable></el-input>
-                    </el-form-item>
-                </div>-->
+                     <el-form-item label="文档类型" prop="type">
+                         <el-input :size="$global.elementSize" v-model="docForm.type" clearable></el-input>
+                     </el-form-item>
+                 </div>-->
 
 
 
 
                 <el-form-item label="排序" prop="sort">
                 <el-form-item label="排序" prop="sort">

@@ -325,6 +325,10 @@ export default {
                     dataList.value.forEach(function (v) {
                     dataList.value.forEach(function (v) {
                         v.checked = false;
                         v.checked = false;
                     })
                     })
+                    if(!isAllSelect.value) {
+                        selectText.value = '全选';
+                        isAllSelect.value=true;
+                    }
                 }
                 }
             })
             })
         }
         }
@@ -363,6 +367,10 @@ export default {
             dataList.value.filter(function (item){
             dataList.value.filter(function (item){
                 item.checked=false;
                 item.checked=false;
             })
             })
+            if(!isAllSelect.value) {
+                selectText.value = '全选';
+                isAllSelect.value=true;
+            }
         }
         }
 
 
         // 刷新
         // 刷新
@@ -379,9 +387,9 @@ export default {
 
 
 
 
             }, 1000)
             }, 1000)
-            if(!isAllSelect){
+            if(!isAllSelect.value){
                 proxy.selectText='全选'
                 proxy.selectText='全选'
-                isAllSelect=true;
+                isAllSelect.value=true;
             }
             }
         }
         }
 
 
@@ -901,8 +909,8 @@ export default {
         })
         })
         //全选
         //全选
         let selectAll=()=>{
         let selectAll=()=>{
-            isAllSelect=!isAllSelect;
-            if(isAllSelect){
+            isAllSelect.value=!isAllSelect.value;
+            if(isAllSelect.value){
                 dataList.value.filter(function (v) {
                 dataList.value.filter(function (v) {
                     v.checked = false
                     v.checked = false
 
 

@@ -47,8 +47,13 @@ export default {
             window.addEventListener('message',function(e){
             window.addEventListener('message',function(e){
                 if(e.data.type=='detail'){
                 if(e.data.type=='detail'){
                     proxy.$global.openDetail(e.data.data.resId, e.data.data.resType, proxy);
                     proxy.$global.openDetail(e.data.data.resId, e.data.data.resType, proxy);
+                }else if(e.data.type=='topology'){
+                    //子页面点击拓扑图标进入拓扑页面
+                    proxy.$global.viewResTopo(e.data.data.resId);
                 }else{
                 }else{
+
                 }
                 }
+
             })
             })
             //end lsq 2022-03-15
             //end lsq 2022-03-15
         })
         })

 <cm-document :isView="true"
 <cm-document :isView="true"
              :viewTypeId="docType"
              :viewTypeId="docType"
-             :fileIds="[docType]"
              :viewTypeName="docTypeName"
              :viewTypeName="docTypeName"
              :types="[docType,'user']"
              :types="[docType,'user']"
              :checkAuth="false"
              :checkAuth="false"