Authored by xwx

快照概览优化

@@ -24,7 +24,7 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) { @@ -24,7 +24,7 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
24 24
25 findAllSnapshot(); 25 findAllSnapshot();
26 26
27 - // commonDetail.bindTips(); 27 + commonDetail.bindTips();
28 28
29 function findAllSnapshot() { 29 function findAllSnapshot() {
30 let url = common.domainName + '/api-web/snapshot/info?resId='+ resId + '&batchNo='+batchNo +'&access_token='+sessions.getToken().access_token; 30 let url = common.domainName + '/api-web/snapshot/info?resId='+ resId + '&batchNo='+batchNo +'&access_token='+sessions.getToken().access_token;
@@ -38,7 +38,7 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) { @@ -38,7 +38,7 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
38 commonDetail.snapshotRenderResHealth(res.object.snapshotResState); 38 commonDetail.snapshotRenderResHealth(res.object.snapshotResState);
39 } 39 }
40 commonDetail.anapshotRenderTextCols('hostminicomputerpartition_jbxx',res.object.snapshotBaseInformationList,2); 40 commonDetail.anapshotRenderTextCols('hostminicomputerpartition_jbxx',res.object.snapshotBaseInformationList,2);
41 - if (res.object.importantInformationList>0){ 41 + if (res.object.importantInformationList > 0){
42 commonDetail.anapshotRenderTextCols('hostminicomputerpartition_sysfile',res.object.importantInformationList,2); 42 commonDetail.anapshotRenderTextCols('hostminicomputerpartition_sysfile',res.object.importantInformationList,2);
43 }else { 43 }else {
44 $("#hostminicomputerpartition_sysfile").html('<div style="text-align:center;"><span style="line-height: 150px; padding:20px;font-style:normal;">暂无数据</span></div>') 44 $("#hostminicomputerpartition_sysfile").html('<div style="text-align:center;"><span style="line-height: 150px; padding:20px;font-style:normal;">暂无数据</span></div>')
@@ -132,12 +132,5 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) { @@ -132,12 +132,5 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
132 } 132 }
133 133
134 134
135 -  
136 - //定时任务  
137 - var timer = setInterval(function () {  
138 - findAllSnapshot()  
139 - }, commonDetail.timerTime);  
140 - commonDetail.detailTimer.push(timer);  
141 -  
142 }); 135 });
143 }); 136 });
@@ -8375,7 +8375,7 @@ form.layui-card-header.layuiadmin-card-header-auto { @@ -8375,7 +8375,7 @@ form.layui-card-header.layuiadmin-card-header-auto {
8375 8375
8376 .info-table .div-link-state-list { 8376 .info-table .div-link-state-list {
8377 height: 30px; 8377 height: 30px;
8378 - width: calc(100% + 50px); 8378 + width: calc(100%);
8379 float: left; 8379 float: left;
8380 } 8380 }
8381 8381
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-body"> 6 <div class="layui-card-body">
7 <div class="lay-row"> 7 <div class="lay-row">
8 - <div class="lay-row-item" > 8 + <div class="lay-row-item" style="max-width: 200px">
9 <h5 class="lay-row-title">资源状态</h5> 9 <h5 class="lay-row-title">资源状态</h5>
10 <div class="res-state" id="hostminicomputerpartition_resstate"> 10 <div class="res-state" id="hostminicomputerpartition_resstate">
11 <div class="res-state-pie res-state-pie--good"></div> 11 <div class="res-state-pie res-state-pie--good"></div>
@@ -16,8 +16,9 @@ @@ -16,8 +16,9 @@
16 </ul> 16 </ul>
17 </div> 17 </div>
18 </div> 18 </div>
19 - <div class="lay-row-item lay-row-item--half">  
20 - <h5 class="lay-row-title">基本信息</h5> 19 + <div class="lay-row-item lay-row-item--half" style="width: calc(100% - 200px)">
  20 + <h5 class="lay-row-title">基本信息<i class="iconfont detail_base_info"
  21 + data-id="hostminicomputerpartition_jbxx">&#xe61e;</i></h5>
21 <ul class="info-table" id="hostminicomputerpartition_jbxx"> 22 <ul class="info-table" id="hostminicomputerpartition_jbxx">
22 </ul> 23 </ul>
23 </div> 24 </div>
@@ -42,13 +42,13 @@ @@ -42,13 +42,13 @@
42 <template #default="{row,prop,column}"> 42 <template #default="{row,prop,column}">
43 <div v-if="prop == 'state'"> 43 <div v-if="prop == 'state'">
44 <div v-if="row.state == 0"> 44 <div v-if="row.state == 0">
45 - <el-tag>同步</el-tag> 45 + <el-tag>创建</el-tag>
46 </div> 46 </div>
47 <div v-if="row.state == 1"> 47 <div v-if="row.state == 1">
48 - <el-tag type="success">同步</el-tag> 48 + <el-tag type="success">创建</el-tag>
49 </div> 49 </div>
50 <div v-if="row.state == 2"> 50 <div v-if="row.state == 2">
51 - <el-tag type="danger">同步失败</el-tag> 51 + <el-tag type="danger">创建失败</el-tag>
52 </div> 52 </div>
53 </div> 53 </div>
54 </template> 54 </template>
@@ -44,7 +44,7 @@ export default { @@ -44,7 +44,7 @@ export default {
44 label: '同步状态', 44 label: '同步状态',
45 sortable: true, 45 sortable: true,
46 align: 'center', 46 align: 'center',
47 - width: '150' 47 + width: '170'
48 }, 48 },
49 { 49 {
50 prop: 'batchNo', 50 prop: 'batchNo',
@@ -96,6 +96,8 @@ export default { @@ -96,6 +96,8 @@ export default {
96 batchNo: batchNo.toString() 96 batchNo: batchNo.toString()
97 } 97 }
98 deleteSnapshot(params); 98 deleteSnapshot(params);
  99 + }else {
  100 + proxy.$global.showMsg("请选择需要操作的历史快照","warning");
99 } 101 }
100 } 102 }
101 //删除 103 //删除
@@ -22,21 +22,20 @@ export default { @@ -22,21 +22,20 @@ export default {
22 label: '资源类型', 22 label: '资源类型',
23 sortable: true, 23 sortable: true,
24 align: 'center', 24 align: 'center',
25 - width: '220', 25 + width: '200',
26 }, 26 },
27 { 27 {
28 prop: 'resName', 28 prop: 'resName',
29 label: '资源名称', 29 label: '资源名称',
30 sortable: true, 30 sortable: true,
31 - align: 'center',  
32 - width: '360' 31 + align: 'center'
33 }, 32 },
34 { 33 {
35 prop: 'ip', 34 prop: 'ip',
36 label: 'IP地址', 35 label: 'IP地址',
37 sortable: true, 36 sortable: true,
38 align: 'center', 37 align: 'center',
39 - width: '150' 38 + width: '130'
40 }, { 39 }, {
41 prop: 'admin', 40 prop: 'admin',
42 label: '负责人', 41 label: '负责人',
@@ -58,18 +57,19 @@ export default { @@ -58,18 +57,19 @@ export default {
58 width: '140' 57 width: '140'
59 }, 58 },
60 { 59 {
61 - prop: 'createUser',  
62 - label: '快照创建人', 60 + prop: 'createTime',
  61 + label: '快照创建时间',
63 sortable: true, 62 sortable: true,
64 align: 'center', 63 align: 'center',
65 - width: '130' 64 + width: '170'
66 }, 65 },
67 { 66 {
68 - prop: 'createTime',  
69 - label: '快照创建时间', 67 + prop: 'createUser',
  68 + label: '快照创建人',
70 sortable: true, 69 sortable: true,
71 - align: 'center'  
72 - }, 70 + align: 'center',
  71 + width: '120'
  72 + }
73 ] 73 ]
74 }) 74 })
75 75