monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit b3c414873df71417e23935e7d5ae5871e981c6f2 2 parents 1dc2f446 e0370a1a

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

Inline Side-by-side
Showing 12 changed files with 76 additions and 31 deletions
@@ -147,6 +147,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -147,6 +147,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
147 function initUserSelect() { 147 function initUserSelect() {
148 $.ajax({ 148 $.ajax({
149 url: domainName + '/api-user/users/getAll?access_token=' + accessToken, 149 url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
  150 + async: false, // 接口请求导致，设置默认值出错
150 success: function (res) { 151 success: function (res) {
151 userSelect = xmSelect.render({ 152 userSelect = xmSelect.render({
152 el: '.adminUser', 153 el: '.adminUser',
@@ -15,8 +15,9 @@ layui.define(['commonDetail','common'], function (exports) { @@ -15,8 +15,9 @@ layui.define(['commonDetail','common'], function (exports) {
15 } 15 }
16 commonDetail.bindTips(); 16 commonDetail.bindTips();
17 //基本信息 17 //基本信息
18 - var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI159D23D6,KPIEA270DAB,KPI1635BB9B,KPID7BE5E90,KPIF6A66270,KPI4419E8A1,KPIE6A60DBD," +  
19 - "KPI67AC023C,KPI0990CD44,KPI1584BE1C,KPI191373C6,KPI29D42042,KPI9B34D90F,KPI81BAB2C4"; 18 + //2020-02-07 xwx屏蔽：Vcpu核数，频率 与李腾飞确认采集不到，屏蔽
  19 + var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI159D23D6,KPIEA270DAB,KPI1635BB9B,KPID7BE5E90,KPIF6A66270,KPI4419E8A1," +
  20 + "KPI67AC023C,KPI1584BE1C,KPI191373C6,KPI29D42042,KPI9B34D90F,KPI81BAB2C4";
20 21
21 reload() 22 reload()
22 23
@@ -22,13 +22,16 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function @@ -22,13 +22,16 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
22 //基本信息 22 //基本信息
23 var jbxxKpiId = 'KPIBB1082BE,KPI72E7FB4B,KPIE13DD9A3,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIF74D9D2B'; 23 var jbxxKpiId = 'KPIBB1082BE,KPI72E7FB4B,KPIE13DD9A3,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIF74D9D2B';
24 // 关键信息 24 // 关键信息
25 - var zyxxKpiId = 'KPIA838A981,KPI1584BE1C,KPI4A216352'; 25 + //2020-02-07 xwx屏蔽：内存大小 与李腾飞确认采集不到，屏蔽
  26 + var zyxxKpiId = 'KPIA838A981,KPI4A216352';
26 // 风扇信息 27 // 风扇信息
27 var haKpiIds = 'KPI28C9A37D,KPIF5D53796,KPI1A9360B6'; 28 var haKpiIds = 'KPI28C9A37D,KPIF5D53796,KPI1A9360B6';
28 // 硬盘信息 29 // 硬盘信息
29 - var diskKpiIds = 'KPI9D22EAB6,KPI7E96CACC,KPI29D42042,KPI1988842F,KPI50331084,KPI2C8A6D17'; 30 + //2020-02-07 xwx屏蔽：硬盘温度 与李腾飞确认采集不到，屏蔽
  31 + var diskKpiIds = 'KPI9D22EAB6,KPI29D42042,KPI1988842F,KPI50331084,KPI2C8A6D17';
30 // 虚拟服务信息 32 // 虚拟服务信息
31 - var vsKpiIds = 'KPIFABFD741,KPIFB844B8B,KPI9B417789,KPI2DC9105C,KPI39C76443'; 33 + //2020-02-07 xwx屏蔽：启动状态，IP地址,端口号 与李腾飞确认采集不到，屏蔽
  34 + var vsKpiIds = 'KPIFABFD741';
32 35
33 reload() 36 reload()
34 37
@@ -19,7 +19,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) { @@ -19,7 +19,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
19 //基本信息 19 //基本信息
20 var jbxxKpiId = 'KPI9F694F60,KPIBB1082BE,KPIDAC7AC64,KPICA591C11'; 20 var jbxxKpiId = 'KPI9F694F60,KPIBB1082BE,KPIDAC7AC64,KPICA591C11';
21 //接口信息kpiids 21 //接口信息kpiids
22 - var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB6D0352E,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPIA3A74798'; 22 + //2020-02-07 xwx屏蔽：MTU，工作模式，管理状态，接口IP 与李腾飞确认采集不到，屏蔽
  23 + var interfaceinfoKpis = 'KPI49ACAAFD,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIE4B51D5C,KPI7E81DFB5';
23 24
24 reload() 25 reload()
25 26
@@ -80,17 +80,18 @@ @@ -80,17 +80,18 @@
80 <h5 class="lay-row-title">网络流出速率</h5> 80 <h5 class="lay-row-title">网络流出速率</h5>
81 <div id="huawei_cloud_physics_out_linechart" class="detail_line_chart"></div> 81 <div id="huawei_cloud_physics_out_linechart" class="detail_line_chart"></div>
82 </div> 82 </div>
83 - </div>  
84 - <div class="lay-row">  
85 <div class="lay-row-item"> 83 <div class="lay-row-item">
86 <h5 class="lay-row-title">磁盘IO写入</h5> 84 <h5 class="lay-row-title">磁盘IO写入</h5>
87 <div id="huawei_cloud_physics_disk_write_linechart" class="detail_line_chart"></div> 85 <div id="huawei_cloud_physics_disk_write_linechart" class="detail_line_chart"></div>
88 </div> 86 </div>
89 - <div class="lay-row-item">  
90 - <h5 class="lay-row-title">磁盘IO读出</h5>  
91 - <div id="huawei_cloud_physics_disk_read_linechart" class="detail_line_chart"></div>  
92 - </div>  
93 </div> 87 </div>
  88 + <!-- 2022-01-07 xwx注 与李腾飞确认屏蔽-->
  89 +<!-- <div class="lay-row">-->
  90 +<!-- <div class="lay-row-item">-->
  91 +<!-- <h5 class="lay-row-title">磁盘IO读出</h5>-->
  92 +<!-- <div id="huawei_cloud_physics_disk_read_linechart" class="detail_line_chart"></div>-->
  93 +<!-- </div>-->
  94 +<!-- </div>-->
94 <div class="lay-row"> 95 <div class="lay-row">
95 <div class="lay-row-item"> 96 <div class="lay-row-item">
96 <h5 class="lay-row-title">实时告警动态</h5> 97 <h5 class="lay-row-title">实时告警动态</h5>
@@ -45,14 +45,15 @@ @@ -45,14 +45,15 @@
45 </ul> 45 </ul>
46 </div> 46 </div>
47 </div> 47 </div>
48 - <div class="lay-row">  
49 - <div class="lay-row-item">  
50 - <h5 class="lay-row-title">风扇信息  
51 - <span id="loadbalancing_fanDownload" class="layui-table-link" style="margin-left: 10px;">下载</span>  
52 - <span id="loadbalancing_fanMore" class="layui-table-link">更多</span></h5>  
53 - <div id="loadbalancing_fan"></div>  
54 - </div>  
55 - </div> 48 + <!-- 2022-01-07 xwx注 与李腾飞确认屏蔽-->
  49 +<!-- <div class="lay-row">-->
  50 +<!-- <div class="lay-row-item">-->
  51 +<!-- <h5 class="lay-row-title">风扇信息-->
  52 +<!-- <span id="loadbalancing_fanDownload" class="layui-table-link" style="margin-left: 10px;">下载</span>-->
  53 +<!-- <span id="loadbalancing_fanMore" class="layui-table-link">更多</span></h5>-->
  54 +<!-- <div id="loadbalancing_fan"></div>-->
  55 +<!-- </div>-->
  56 +<!-- </div>-->
56 <div class="lay-row"> 57 <div class="lay-row">
57 <div class="lay-row-item"> 58 <div class="lay-row-item">
58 <h5 class="lay-row-title">硬盘信息 59 <h5 class="lay-row-title">硬盘信息
@@ -237,10 +237,8 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => { @@ -237,10 +237,8 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
237 if (res && res.success) { 237 if (res && res.success) {
238 let obj = res.object; 238 let obj = res.object;
239 let cmdVal = obj.cmdbValue; 239 let cmdVal = obj.cmdbValue;
240 -  
241 - let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&id=${resId}`  
242 -  
243 - //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}`); 240 + //let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&ciId=${resId}`
  241 + let url = `${preUrl}/#/CI/configuration-item/detail/${resId}/${cmdVal}`
244 global.openBlankWindow(url, "80%", "90%"); 242 global.openBlankWindow(url, "80%", "90%");
245 } else { 243 } else {
246 proxy.$global.showMsg('没有查询到关联数据，请配置！', "error"); 244 proxy.$global.showMsg('没有查询到关联数据，请配置！', "error");
@@ -20,7 +20,8 @@ layui.define(['commonDetail','common'], function (exports) { @@ -20,7 +20,8 @@ layui.define(['commonDetail','common'], function (exports) {
20 } 20 }
21 commonDetail.bindTips(); 21 commonDetail.bindTips();
22 //基本信息 22 //基本信息
23 - var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIFABFD741,KPIB718ADEC,KPI5858832B,KPI2DC9105C,KPI4419E8A1,KPIA47DE8B4,KPI7E81DFB5,KPI6F17667E, KPIF21A9F60, KPI81BAB2C4, KPI5364695E, KPI14E5F9B4, KPIC70A1E3D"; 23 + //2020-02-07 xwx屏蔽：设备序列号，IPV6地址 与李腾飞确认采集不到，屏蔽
  24 + var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIFABFD741,KPIB718ADEC,KPI5858832B,KPI2DC9105C,KPI7E81DFB5,KPI6F17667E, KPIF21A9F60, KPI81BAB2C4, KPI5364695E, KPI14E5F9B4, KPIC70A1E3D";
24 25
25 reload() 26 reload()
26 27
@@ -597,7 +597,14 @@ @@ -597,7 +597,14 @@
597 <script type="text/html" id="resindex_resName"> 597 <script type="text/html" id="resindex_resName">
598 <!-- 更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6--> 598 <!-- 更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6-->
599 <div id="res-div"> 599 <div id="res-div">
600 - {{# var w=$("[lay-id='resListTable'] table thead th[data-field='resName']").data('minwidth'); 600 + {{# var urlLast=window.location.hash;
  601 + var w=$(".layui-table thead th[data-field='resName']").data('minwidth');
  602 + if(urlLast=="#/res/index"){
  603 + w=$("[lay-id='resListTable'] table thead th[data-field='resName'").data('minwidth');
  604 +
  605 + }else if(urlLast=="#/biz/index"){
  606 + w=$("[lay-id='bizListTable'] table thead th[data-field='resName'").data('minwidth');
  607 + }
601 var maxW=(w-45)+'px'; 608 var maxW=(w-45)+'px';
602 var styleW="float: left;max-width: "+maxW+";overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;"; 609 var styleW="float: left;max-width: "+maxW+";overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;";
603 }} 610 }}
@@ -188,8 +188,15 @@ @@ -188,8 +188,15 @@
188 <el-form-item label="配置信息" prop="name"> 188 <el-form-item label="配置信息" prop="name">
189 <el-input :size="$global.elementSize" v-model="treeNodeForm.options" clearable ></el-input> 189 <el-input :size="$global.elementSize" v-model="treeNodeForm.options" clearable ></el-input>
190 </el-form-item> 190 </el-form-item>
191 - <el-form-item label="CMDB资源类型ID" prop="name">  
192 - <el-input :size="$global.elementSize" v-model="treeNodeForm.cmdbResTypeId" clearable ></el-input> 191 + <el-form-item label="CMDB资源类型" prop="name" style="text-align: left">
  192 + <el-select style="width: 100%" :size="$global.elementSize" v-model="treeNodeForm.cmdbResTypeId" placeholder="请选择CMDB资源类型!" clearable filterable >
  193 + <el-option
  194 + v-for="item in cmdbResTypeList"
  195 + :key="item.id"
  196 + :label="item.name"
  197 + :value="item.id">
  198 + </el-option>
  199 + </el-select>
193 </el-form-item> 200 </el-form-item>
194 201
195 <!--<el-form-item label="详情页配置函数" prop="type"> 202 <!--<el-form-item label="详情页配置函数" prop="type">
@@ -156,6 +156,7 @@ const treeNodeConfig = (currentNode) => { @@ -156,6 +156,7 @@ const treeNodeConfig = (currentNode) => {
156 }); 156 });
157 157
158 let treeNodeFormRules = Vue.ref({}); 158 let treeNodeFormRules = Vue.ref({});
  159 + let cmdbResTypeList = Vue.ref([]);
159 160
160 /** 161 /**
161 * 展示树节点配置 162 * 展示树节点配置
@@ -172,10 +173,23 @@ const treeNodeConfig = (currentNode) => { @@ -172,10 +173,23 @@ const treeNodeConfig = (currentNode) => {
172 cmdbResTypeId: currentNode.value.map.cmdbResTypeId, 173 cmdbResTypeId: currentNode.value.map.cmdbResTypeId,
173 } 174 }
174 } 175 }
  176 + getCmdbResTypeList();
175 treeNodeDialogFlg.value = flg; 177 treeNodeDialogFlg.value = flg;
176 } 178 }
177 179
178 180
  181 + let getCmdbResTypeList = () =>{
  182 + if(cmdbResTypeList.value.length > 0){
  183 + return;
  184 + }
  185 + proxy.$http.get(`/api-web/v32/res/config/getCmdbResTypeList`, {}, function (res) {
  186 + if (res && res.success) {
  187 + cmdbResTypeList.value = res.data;
  188 + }
  189 + });
  190 + }
  191 +
  192 +
179 /** 193 /**
180 * 保存树节点配置 194 * 保存树节点配置
181 */ 195 */
@@ -192,7 +206,9 @@ const treeNodeConfig = (currentNode) => { @@ -192,7 +206,9 @@ const treeNodeConfig = (currentNode) => {
192 showTreeNodeDialog, 206 showTreeNodeDialog,
193 saveTreeNodeConfig, 207 saveTreeNodeConfig,
194 treeNodeForm, 208 treeNodeForm,
195 - treeNodeFormRules 209 + treeNodeFormRules,
  210 + cmdbResTypeList,
  211 + getCmdbResTypeList
196 } 212 }
197 } 213 }
198 214
@@ -261,7 +277,9 @@ export default { @@ -261,7 +277,9 @@ export default {
261 showTreeNodeDialog, 277 showTreeNodeDialog,
262 saveTreeNodeConfig, 278 saveTreeNodeConfig,
263 treeNodeForm, 279 treeNodeForm,
264 - treeNodeFormRules 280 + treeNodeFormRules,
  281 + cmdbResTypeList,
  282 + getCmdbResTypeList
265 } = treeNodeConfig(currentNode); 283 } = treeNodeConfig(currentNode);
266 284
267 285
@@ -494,7 +512,9 @@ export default { @@ -494,7 +512,9 @@ export default {
494 showTreeNodeDialog, 512 showTreeNodeDialog,
495 saveTreeNodeConfig, 513 saveTreeNodeConfig,
496 treeNodeForm, 514 treeNodeForm,
497 - treeNodeFormRules 515 + treeNodeFormRules,
  516 + cmdbResTypeList,
  517 + getCmdbResTypeList
498 } 518 }
499 } 519 }
500 } 520 }
@@ -60,6 +60,8 @@ export default { @@ -60,6 +60,8 @@ export default {
60 60
61 //点击标签进行搜索 61 //点击标签进行搜索
62 const changeTag = (status) => { 62 const changeTag = (status) => {
  63 + currentPage.value=1;
  64 + pageSize.value=10;
63 checkedId.value = status; 65 checkedId.value = status;
64 keyword.value=status; 66 keyword.value=status;
65 getDataList(); 67 getDataList();
@@ -133,6 +135,8 @@ export default { @@ -133,6 +135,8 @@ export default {
133 } 135 }
134 // 点击按钮搜索 136 // 点击按钮搜索
135 let onBtnSearch = () => { 137 let onBtnSearch = () => {
  138 + currentPage.value=1;
  139 + pageSize.value=10;
136 getDataList(); 140 getDataList();
137 } 141 }
138 //获取缓存数据 142 //获取缓存数据