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

【964】快照管理搜索条件增加悬浮提示



See merge request !759

@@ -3820,7 +3820,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                             layer.open({
                             layer.open({
                                 title: [name, 'font-size:18px;'],
                                 title: [name, 'font-size:18px;'],
                                 type: 2,
                                 type: 2,
-                                area: ['90%', '90%'],
+                                area: ['65%', '90%'],
                                 shadeClose: true,//开启遮罩层
                                 shadeClose: true,//开启遮罩层
                                 id: 'res-history',
                                 id: 'res-history',
                                 content: ['/vue3/index.html#/vue3/snapshot/history' + paramStr, 'no'],
                                 content: ['/vue3/index.html#/vue3/snapshot/history' + paramStr, 'no'],

@@ -33,11 +33,11 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
                 async: false,
                 async: false,
                 success: function (res) {
                 success: function (res) {
                     if (res.success){
                     if (res.success){
-                        if (res.object.snapshotResState.length > 0){
+                        if (res.object.snapshotResState != null && res.object.snapshotResState.length > 0){
                             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.length > 0){
+                        if (res.object.importantInformationList != null && res.object.importantInformationList.length > 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>')

@@ -4,7 +4,10 @@
            <div class="condition esData-conditon" style="justify-content: space-between;width: 100%;">
            <div class="condition esData-conditon" style="justify-content: space-between;width: 100%;">
                <el-form :inline="true">
                <el-form :inline="true">
                    <el-form-item>
                    <el-form-item>
+                       <el-tooltip placement="bottom-start">
+                           <template #content> 资源名称 <br /> 资源ip <br /> 业务名称</template>
                            <el-input clearable :size="$global.elementConfig.size.input" v-model="queryParams.keyWord" placeholder="关键字检索" />
                            <el-input clearable :size="$global.elementConfig.size.input" v-model="queryParams.keyWord" placeholder="关键字检索" />
+                       </el-tooltip>
                    </el-form-item>
                    </el-form-item>
                    <el-form-item>
                    <el-form-item>
                        <el-dropdown>
                        <el-dropdown>

@@ -122,6 +122,7 @@ export default {
             if (val == 4){
             if (val == 4){
                 visiblePopover.value = !visiblePopover.value;
                 visiblePopover.value = !visiblePopover.value;
             }else{
             }else{
+                visiblePopover.value = false;
                 getDataList();
                 getDataList();
                 getEchartsData();
                 getEchartsData();
             }
             }

@@ -188,6 +188,7 @@ export default {
             if (val == 4){
             if (val == 4){
                 visiblePopover.value = !visiblePopover.value;
                 visiblePopover.value = !visiblePopover.value;
             }else{
             }else{
+                visiblePopover.value = false;
                 getDataList();
                 getDataList();
                 getEchartsData();
                 getEchartsData();
             }
             }