Merge branch 'master-500-dev-xwx' into 'master-500-dev'

快照概览优化



See merge request !755

@@ -24,7 +24,7 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
 
 
         findAllSnapshot();
         findAllSnapshot();
 
 
-        // commonDetail.bindTips();
+        commonDetail.bindTips();
 
 
         function findAllSnapshot() {
         function findAllSnapshot() {
             let url = common.domainName + '/api-web/snapshot/info?resId='+ resId + '&batchNo='+batchNo +'&access_token='+sessions.getToken().access_token;
             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) {
                             commonDetail.snapshotRenderResHealth(res.object.snapshotResState);
                             commonDetail.snapshotRenderResHealth(res.object.snapshotResState);
                         }
                         }
                         commonDetail.anapshotRenderTextCols('hostminicomputerpartition_jbxx',res.object.snapshotBaseInformationList,2);
                         commonDetail.anapshotRenderTextCols('hostminicomputerpartition_jbxx',res.object.snapshotBaseInformationList,2);
-                        if (res.object.importantInformationList>0){
+                        if (res.object.importantInformationList > 0){
                             commonDetail.anapshotRenderTextCols('hostminicomputerpartition_sysfile',res.object.importantInformationList,2);
                             commonDetail.anapshotRenderTextCols('hostminicomputerpartition_sysfile',res.object.importantInformationList,2);
                         }else {
                         }else {
                             $("#hostminicomputerpartition_sysfile").html('<div style="text-align:center;"><span style="line-height: 150px; padding:20px;font-style:normal;">暂无数据</span></div>')
                             $("#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) {
         }
         }
 
 
 
 
-
-        //定时任务
-        var timer = setInterval(function () {
-            findAllSnapshot()
-        }, commonDetail.timerTime);
-        commonDetail.detailTimer.push(timer);
-
     });
     });
 });
 });

@@ -8375,7 +8375,7 @@ form.layui-card-header.layuiadmin-card-header-auto {
 
 
 .info-table .div-link-state-list {
 .info-table .div-link-state-list {
     height: 30px;
     height: 30px;
-    width: calc(100% + 50px);
+    width: calc(100%);
     float: left;
     float: left;
 }
 }
 
 

@@ -5,7 +5,7 @@
             <div class="layui-card">
             <div class="layui-card">
                 <div class="layui-card-body">
                 <div class="layui-card-body">
                     <div class="lay-row">
                     <div class="lay-row">
-                        <div class="lay-row-item" >
+                        <div class="lay-row-item" style="max-width: 200px">
                             <h5 class="lay-row-title">资源状态</h5>
                             <h5 class="lay-row-title">资源状态</h5>
                             <div class="res-state" id="hostminicomputerpartition_resstate">
                             <div class="res-state" id="hostminicomputerpartition_resstate">
                                 <div class="res-state-pie res-state-pie--good">优</div>
                                 <div class="res-state-pie res-state-pie--good">优</div>
@@ -16,8 +16,9 @@
                                 </ul>
                                 </ul>
                             </div>
                             </div>
                         </div>
                         </div>
-                        <div class="lay-row-item lay-row-item--half">
-                            <h5 class="lay-row-title">基本信息</h5>
+                        <div class="lay-row-item lay-row-item--half" style="width: calc(100% - 200px)">
+                            <h5 class="lay-row-title">基本信息<i class="iconfont detail_base_info"
+                                                             data-id="hostminicomputerpartition_jbxx">&#xe61e;</i></h5>
                             <ul class="info-table" id="hostminicomputerpartition_jbxx">
                             <ul class="info-table" id="hostminicomputerpartition_jbxx">
                             </ul>
                             </ul>
                         </div>
                         </div>

@@ -42,13 +42,13 @@
                 <template #default="{row,prop,column}">
                 <template #default="{row,prop,column}">
                     <div v-if="prop == 'state'">
                     <div v-if="prop == 'state'">
                         <div v-if="row.state == 0">
                         <div v-if="row.state == 0">
-                            <el-tag>同步中</el-tag>
+                            <el-tag>创建中</el-tag>
                         </div>
                         </div>
                         <div v-if="row.state == 1">
                         <div v-if="row.state == 1">
-                            <el-tag type="success">已同步</el-tag>
+                            <el-tag type="success">已创建</el-tag>
                         </div>
                         </div>
                         <div v-if="row.state == 2">
                         <div v-if="row.state == 2">
-                            <el-tag type="danger">同步失败</el-tag>
+                            <el-tag type="danger">创建失败</el-tag>
                         </div>
                         </div>
                     </div>
                     </div>
                 </template>
                 </template>

@@ -44,7 +44,7 @@ export default {
                     label: '同步状态',
                     label: '同步状态',
                     sortable: true,
                     sortable: true,
                     align: 'center',
                     align: 'center',
-                    width: '150'
+                    width: '170'
                 },
                 },
                 {
                 {
                     prop: 'batchNo',
                     prop: 'batchNo',
@@ -96,6 +96,8 @@ export default {
                     batchNo: batchNo.toString()
                     batchNo: batchNo.toString()
                 }
                 }
                 deleteSnapshot(params);
                 deleteSnapshot(params);
+            }else {
+                proxy.$global.showMsg("请选择需要操作的历史快照","warning");
             }
             }
         }
         }
         //删除
         //删除

@@ -22,21 +22,20 @@ export default {
                     label: '资源类型',
                     label: '资源类型',
                     sortable: true,
                     sortable: true,
                     align: 'center',
                     align: 'center',
-                    width: '220',
+                    width: '200',
                 },
                 },
                 {
                 {
                     prop: 'resName',
                     prop: 'resName',
                     label: '资源名称',
                     label: '资源名称',
                     sortable: true,
                     sortable: true,
-                    align: 'center',
-                    width: '360'
+                    align: 'center'
                 },
                 },
                 {
                 {
                     prop: 'ip',
                     prop: 'ip',
                     label: 'IP地址',
                     label: 'IP地址',
                     sortable: true,
                     sortable: true,
                     align: 'center',
                     align: 'center',
-                    width: '150'
+                    width: '130'
                 }, {
                 }, {
                     prop: 'admin',
                     prop: 'admin',
                     label: '负责人',
                     label: '负责人',
@@ -58,18 +57,19 @@ export default {
                     width: '140'
                     width: '140'
                 },
                 },
                 {
                 {
-                    prop: 'createUser',
-                    label: '快照创建人',
+                    prop: 'createTime',
+                    label: '快照创建时间',
                     sortable: true,
                     sortable: true,
                     align: 'center',
                     align: 'center',
-                    width: '130'
+                    width: '170'
                 },
                 },
                 {
                 {
-                    prop: 'createTime',
-                    label: '快照创建时间',
+                    prop: 'createUser',
+                    label: '快照创建人',
                     sortable: true,
                     sortable: true,
-                    align: 'center'
-                },
+                    align: 'center',
+                    width: '120'
+                }
             ]
             ]
         })
         })