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

@@ -147,6 +147,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
         function initUserSelect() {
             $.ajax({
                 url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
+                async: false, // 接口请求导致，设置默认值出错
                 success: function (res) {
                     userSelect = xmSelect.render({
                         el: '.adminUser',

@@ -15,8 +15,9 @@ layui.define(['commonDetail','common'], function (exports) {
         }
         commonDetail.bindTips();
         //基本信息
-        var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI159D23D6,KPIEA270DAB,KPI1635BB9B,KPID7BE5E90,KPIF6A66270,KPI4419E8A1,KPIE6A60DBD," +
-            "KPI67AC023C,KPI0990CD44,KPI1584BE1C,KPI191373C6,KPI29D42042,KPI9B34D90F,KPI81BAB2C4";
+        //2020-02-07 xwx屏蔽：Vcpu核数，频率 与李腾飞确认采集不到，屏蔽
+        var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI159D23D6,KPIEA270DAB,KPI1635BB9B,KPID7BE5E90,KPIF6A66270,KPI4419E8A1," +
+            "KPI67AC023C,KPI1584BE1C,KPI191373C6,KPI29D42042,KPI9B34D90F,KPI81BAB2C4";
 
         reload()
 

@@ -22,13 +22,16 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
         //基本信息
         var jbxxKpiId = 'KPIBB1082BE,KPI72E7FB4B,KPIE13DD9A3,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIF74D9D2B';
         // 关键信息
-        var zyxxKpiId = 'KPIA838A981,KPI1584BE1C,KPI4A216352';
+        //2020-02-07 xwx屏蔽：内存大小 与李腾飞确认采集不到，屏蔽
+        var zyxxKpiId = 'KPIA838A981,KPI4A216352';
         // 风扇信息
         var haKpiIds = 'KPI28C9A37D,KPIF5D53796,KPI1A9360B6';
         // 硬盘信息
-        var diskKpiIds = 'KPI9D22EAB6,KPI7E96CACC,KPI29D42042,KPI1988842F,KPI50331084,KPI2C8A6D17';
+        //2020-02-07 xwx屏蔽：硬盘温度 与李腾飞确认采集不到，屏蔽
+        var diskKpiIds = 'KPI9D22EAB6,KPI29D42042,KPI1988842F,KPI50331084,KPI2C8A6D17';
         // 虚拟服务信息
-        var vsKpiIds = 'KPIFABFD741,KPIFB844B8B,KPI9B417789,KPI2DC9105C,KPI39C76443';
+        //2020-02-07 xwx屏蔽：启动状态，IP地址,端口号 与李腾飞确认采集不到，屏蔽
+        var vsKpiIds = 'KPIFABFD741';
 
         reload()
 

@@ -19,7 +19,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
         //基本信息
         var jbxxKpiId = 'KPI9F694F60,KPIBB1082BE,KPIDAC7AC64,KPICA591C11';
         //接口信息kpiids
-        var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB6D0352E,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPIA3A74798';
+        //2020-02-07 xwx屏蔽：MTU，工作模式，管理状态，接口IP 与李腾飞确认采集不到，屏蔽
+        var interfaceinfoKpis = 'KPI49ACAAFD,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIE4B51D5C,KPI7E81DFB5';
 
         reload()
 

@@ -80,17 +80,18 @@
                             <h5 class="lay-row-title">网络流出速率</h5>
                             <div id="huawei_cloud_physics_out_linechart" class="detail_line_chart"></div>
                         </div>
-                    </div>
-                    <div class="lay-row">
                         <div class="lay-row-item">
                             <h5 class="lay-row-title">磁盘IO写入</h5>
                             <div id="huawei_cloud_physics_disk_write_linechart" class="detail_line_chart"></div>
                         </div>
-                        <div class="lay-row-item">
-                            <h5 class="lay-row-title">磁盘IO读出</h5>
-                            <div id="huawei_cloud_physics_disk_read_linechart" class="detail_line_chart"></div>
-                        </div>
                     </div>
+                    <!--                        2022-01-07 xwx注 与李腾飞确认屏蔽-->
+<!--                    <div class="lay-row">-->
+<!--                        <div class="lay-row-item">-->
+<!--                            <h5 class="lay-row-title">磁盘IO读出</h5>-->
+<!--                            <div id="huawei_cloud_physics_disk_read_linechart" class="detail_line_chart"></div>-->
+<!--                        </div>-->
+<!--                    </div>-->
                     <div class="lay-row">
                         <div class="lay-row-item">
                             <h5 class="lay-row-title">实时告警动态</h5>

@@ -45,14 +45,15 @@
                             </ul>
                         </div>
                     </div>
-                    <div class="lay-row">
-                        <div class="lay-row-item">
-                            <h5 class="lay-row-title">风扇信息
-                                <span id="loadbalancing_fanDownload" class="layui-table-link"  style="margin-left: 10px;">下载</span>
-                                <span id="loadbalancing_fanMore" class="layui-table-link">更多</span></h5>
-                            <div id="loadbalancing_fan"></div>
-                        </div>
-                    </div>
+                    <!--                        2022-01-07 xwx注 与李腾飞确认屏蔽-->
+<!--                    <div class="lay-row">-->
+<!--                        <div class="lay-row-item">-->
+<!--                            <h5 class="lay-row-title">风扇信息-->
+<!--                                <span id="loadbalancing_fanDownload" class="layui-table-link"  style="margin-left: 10px;">下载</span>-->
+<!--                                <span id="loadbalancing_fanMore" class="layui-table-link">更多</span></h5>-->
+<!--                            <div id="loadbalancing_fan"></div>-->
+<!--                        </div>-->
+<!--                    </div>-->
                     <div class="lay-row">
                         <div class="lay-row-item">
                             <h5 class="lay-row-title">硬盘信息

@@ -237,10 +237,8 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
         if (res && res.success) {
             let obj = res.object;
             let cmdVal = obj.cmdbValue;
-
-            let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&id=${resId}`
-
-            //window.open(url, "_blank", `left=100,fullscreen,toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, copyhistory=no, width=${width}, height=${height}`);
+            //let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&ciId=${resId}`
+            let url = `${preUrl}/#/CI/configuration-item/detail/${resId}/${cmdVal}`
             global.openBlankWindow(url, "80%", "90%");
         } else {
             proxy.$global.showMsg('没有查询到关联数据，请配置！', "error");

@@ -20,7 +20,8 @@ layui.define(['commonDetail','common'], function (exports) {
         }
         commonDetail.bindTips();
         //基本信息
-        var jbxxKpi =  "KPIE13DD9A3,KPIF74D9D2B,KPIFABFD741,KPIB718ADEC,KPI5858832B,KPI2DC9105C,KPI4419E8A1,KPIA47DE8B4,KPI7E81DFB5,KPI6F17667E, KPIF21A9F60, KPI81BAB2C4, KPI5364695E,  KPI14E5F9B4, KPIC70A1E3D";
+        //2020-02-07 xwx屏蔽：设备序列号，IPV6地址  与李腾飞确认采集不到，屏蔽
+        var jbxxKpi =  "KPIE13DD9A3,KPIF74D9D2B,KPIFABFD741,KPIB718ADEC,KPI5858832B,KPI2DC9105C,KPI7E81DFB5,KPI6F17667E, KPIF21A9F60, KPI81BAB2C4, KPI5364695E,  KPI14E5F9B4, KPIC70A1E3D";
 
         reload()
 

@@ -597,7 +597,14 @@
 <script type="text/html" id="resindex_resName">
     <!-- 更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6-->
     <div id="res-div">
-        {{# var w=$("[lay-id='resListTable'] table thead th[data-field='resName']").data('minwidth');
+        {{# var urlLast=window.location.hash;
+            var w=$(".layui-table thead th[data-field='resName']").data('minwidth');
+            if(urlLast=="#/res/index"){
+                w=$("[lay-id='resListTable'] table thead th[data-field='resName'").data('minwidth');
+
+            }else if(urlLast=="#/biz/index"){
+                w=$("[lay-id='bizListTable'] 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;";
         }}

@@ -188,8 +188,15 @@
                 <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 label="CMDB资源类型" prop="name" style="text-align: left">
+                    <el-select style="width: 100%" :size="$global.elementSize" v-model="treeNodeForm.cmdbResTypeId"  placeholder="请选择CMDB资源类型!" clearable filterable >
+                        <el-option
+                                v-for="item in cmdbResTypeList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
 
                 <!--<el-form-item label="详情页配置函数" prop="type">

@@ -156,6 +156,7 @@ const treeNodeConfig = (currentNode) => {
     });
 
     let treeNodeFormRules = Vue.ref({});
+    let cmdbResTypeList = Vue.ref([]);
 
     /**
      * 展示树节点配置
@@ -172,10 +173,23 @@ const treeNodeConfig = (currentNode) => {
                 cmdbResTypeId: currentNode.value.map.cmdbResTypeId,
             }
         }
+        getCmdbResTypeList();
         treeNodeDialogFlg.value = flg;
     }
 
 
+    let getCmdbResTypeList = () =>{
+        if(cmdbResTypeList.value.length > 0){
+            return;
+        }
+        proxy.$http.get(`/api-web/v32/res/config/getCmdbResTypeList`, {}, function (res) {
+            if (res && res.success) {
+                cmdbResTypeList.value = res.data;
+            }
+        });
+    }
+
+
     /**
      * 保存树节点配置
      */
@@ -192,7 +206,9 @@ const treeNodeConfig = (currentNode) => {
         showTreeNodeDialog,
         saveTreeNodeConfig,
         treeNodeForm,
-        treeNodeFormRules
+        treeNodeFormRules,
+        cmdbResTypeList,
+        getCmdbResTypeList
     }
 }
 
@@ -261,7 +277,9 @@ export default {
             showTreeNodeDialog,
             saveTreeNodeConfig,
             treeNodeForm,
-            treeNodeFormRules
+            treeNodeFormRules,
+            cmdbResTypeList,
+            getCmdbResTypeList
         } = treeNodeConfig(currentNode);
 
 
@@ -494,7 +512,9 @@ export default {
             showTreeNodeDialog,
             saveTreeNodeConfig,
             treeNodeForm,
-            treeNodeFormRules
+            treeNodeFormRules,
+            cmdbResTypeList,
+            getCmdbResTypeList
         }
     }
 }

@@ -60,6 +60,8 @@ export default {
 
         //点击标签进行搜索
         const changeTag = (status) => {
+            currentPage.value=1;
+            pageSize.value=10;
             checkedId.value = status;
             keyword.value=status;
             getDataList();
@@ -133,6 +135,8 @@ export default {
         }
         // 点击按钮搜索
         let onBtnSearch = () => {
+            currentPage.value=1;
+            pageSize.value=10;
             getDataList();
         }
         //获取缓存数据