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

@@ -637,7 +637,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     field: 'alarmNo', title: '告警编号', align: 'center', width: 140, sort: true,
                 }
                 , {
-                    field: 'resName', title: '资源名称', width: 250, sort: true,
+                    field: 'resName', title: '资源名称', width: 230, sort: true,
                     templet:`
                     <div>
                         <div style="display: flex;align-items: center;">

@@ -1718,9 +1718,24 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             $('table tr').hover(function (obj) {
                 $(obj.currentTarget).find('.reslist-view-topo').removeClass('hide');
                 $(obj.currentTarget).find('.reslist-assets-details').removeClass('hide');
+                // Start 资源视图中的资源名称在表格中溢出时给最大宽度限制-更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6
+                var w=$(obj.currentTarget).find('#res-div span').innerWidth();
+                var spanMaxW=parseInt($(obj.currentTarget).find('#res-div span').css('max-width'));
+                //-20是一个图标的宽度，若要增加图标，这里的20需要增加
+                var maxW=(w-20)+'px';
+                if(w+15>=spanMaxW){
+                    $(obj.currentTarget).find('#res-div span').css('max-width',maxW)
+                }
             }, function (obj) {
                 $(obj.currentTarget).find('.reslist-view-topo').addClass('hide');
                 $(obj.currentTarget).find('.reslist-assets-details').addClass('hide');
+                var w=$(obj.currentTarget).find('#res-div span').innerWidth();
+                var spanMaxW=parseInt($(obj.currentTarget).find('#res-div span').css('max-width'));
+                var maxW=(w+20)+'px';
+                if(w+15>=spanMaxW){
+                    $(obj.currentTarget).find('#res-div span').css('max-width',maxW)
+                }
+                //End LSQ 2022/1/6
             })
 
             // 加入/移出收藏夹

@@ -595,8 +595,13 @@
 
 <!--资源名称-->
 <script type="text/html" id="resindex_resName">
-    <div>
-        <span lay-tips="{{ d.resName }}" style="float: left;width: 180px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;" data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminname="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" data-manageIp="{{d.manageIp}}" data-collProtocol="{{d.collProtocol}}"  data-provider="{{d.provider}}" data-state="{{d.state}}" class="layui-table-link">{{ d.resName }}</span>
+    <!-- 更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6-->
+    <div id="res-div">
+        {{# var w=$("[lay-id='resListTable'] table thead th[data-field='resName']").data('minwidth');
+            var maxW=(w-45)+'px';
+            var styleW="float: left;max-width: "+maxW+";overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;";
+        }}
+        <span lay-tips="{{ d.resName }}" style="{{styleW}}" data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminname="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" data-manageIp="{{d.manageIp}}" data-collProtocol="{{d.collProtocol}}"  data-provider="{{d.provider}}" data-state="{{d.state}}" class="layui-table-link">{{ d.resName }}</span>
         {{# if (d.favId == null) { }}
         <a class="layui-icon layui-icon-rate hide" data-favid="{{d.favId}}" data-id="{{d.resId}}" lay-tips="加入收藏夹" style="font-size: 14px"></a>
         {{# } else { }}

 <div style="display: flex">
-    <div @click="openDetail" style="cursor:pointer;width: calc(100% - 25px)">{{textString}}</div>
+    <div @click="openCmdbAssets" style="cursor:pointer;width: calc(100% - 25px)">{{textString}}</div>
     <el-dropdown style="width: 25px">
         <span class="el-dropdown-link" style="cursor:pointer;">
             <i class="el-icon-more" style="color: blue;font-weight: bold;" />
@@ -12,8 +12,8 @@
                 <el-dropdown-item v-if="topo" title="拓扑" @click="openTopoPage">
                     <i class="iconfont icon-wangluotuopu" style="color: #FEB61E"/>拓扑
                 </el-dropdown-item>
-                <el-dropdown-item v-if="assets" title="资产" @click="openCmdbAssets">
-                    <i class="iconfont icon-assets" style="color: #FEB61E"/>资产
+                <el-dropdown-item v-if="assets" title="资产" @click="openDetail">
+                    <i class="iconfont icon-assets" style="color: #FEB61E"/>详情
                 </el-dropdown-item>
             </el-dropdown-menu>
         </template>

@@ -179,23 +179,27 @@
     <cm-dialog :title="`${currentNode.label}类型属性配置`" width="500px" :showDialogVisible="treeNodeDialogFlg" @hidedialog="showTreeNodeDialog" @okfunc="saveTreeNodeConfig">
         <template v-slot>
             <el-form
-                    label-width="120px"
                     ref="ruleForm"
                     :model="treeNodeForm"
                     :rules="treeNodeFormRules"
                     label-position="right"
-                    label-width="120px">
+                    label-width="150px">
 
                 <el-form-item label="配置信息" prop="name">
                     <el-input :size="$global.elementSize" v-model="treeNodeForm.options" clearable ></el-input>
                 </el-form-item>
+                <el-form-item label="CMDB资源类型ID" prop="name">
+                    <el-input :size="$global.elementSize" v-model="treeNodeForm.cmdbResTypeId" clearable ></el-input>
+                </el-form-item>
 
                 <!--<el-form-item label="详情页配置函数" prop="type">
                     <el-input :size="$global.elementSize" v-model="treeNodeForm.detailFunc" type="textarea" clearable></el-input>
                 </el-form-item>-->
 
-                <el-form-item label="查询视图" prop="sort">
-                    <el-input :size="$global.elementSize" v-model="treeNodeForm.veiwName" clearable readonly></el-input>
+
+
+                <el-form-item label="查询视图" prop="veiwname">
+                    <el-input :size="$global.elementSize" v-model="treeNodeForm.veiwname" clearable readonly></el-input>
                 </el-form-item>
 
             </el-form>

@@ -40,7 +40,6 @@ let configPageEdit = (columns, currentNode) => {
             row.colTypeExtend = '';
             return;
         }
-
         let params = {
             resTypeId: currentNode.value.id,
             colType: row.colType,
@@ -152,7 +151,8 @@ const treeNodeConfig = (currentNode) => {
     let treeNodeDialogFlg = Vue.ref(false);
     let treeNodeForm = Vue.ref({
         options: '',
-        veiwName: ''
+        veiwname: '',
+        cmdbResTypeId:''
     });
 
     let treeNodeFormRules = Vue.ref({});
@@ -168,7 +168,8 @@ const treeNodeConfig = (currentNode) => {
             treeNodeForm.value = {
                 id: currentNode.value.id,
                 options: currentNode.value.map.options,
-                veiwName: currentNode.value.map.veiwName
+                veiwname: currentNode.value.map.veiwName,
+                cmdbResTypeId: currentNode.value.map.cmdbResTypeId,
             }
         }
         treeNodeDialogFlg.value = flg;
@@ -335,6 +336,7 @@ export default {
                 }
                 currentNode.value = data;
                 getConfigData();
+                getColType({});
             }
         }
 

@@ -320,6 +320,7 @@ export default {
         let getPageInfo = ({page, limit}) => {
             searchForm.value.page = page;
             searchForm.value.pageSize = limit;
+debugger
             // 下一页搜索
             getPage();
         }

@@ -15,7 +15,7 @@
 						<el-form :inline="true" :model="searchForm" class="demo-form-inline">
 							<el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name">
 								<el-input v-if="searchInfo.type == 'INPUT'" v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input>
-								<el-select v-else v-model="searchForm[searchInfo.key]" :placeholder="'请选择' + searchInfo.name" clearable >
+								<el-select v-else v-model="searchForm[searchInfo.key]" :placeholder="'请选择' + searchInfo.name" clearable filterable >
 									<el-option
 											v-for="item in searchItem[searchInfo.key]"
 											:key="item.val"