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

@@ -59,7 +59,7 @@ export default {
         ])
         ])
 
 
         //自定义选择时间
         //自定义选择时间
-        let dateValue=Vue.ref();
+        let dateValue=Vue.ref([]);
         //选中的聚合频率
         //选中的聚合频率
         let checkedId=Vue.ref();
         let checkedId=Vue.ref();
         let commandVal=Vue.ref('聚合频率')
         let commandVal=Vue.ref('聚合频率')
@@ -239,7 +239,8 @@ export default {
         const getDateTime=(newDate)=>{
         const getDateTime=(newDate)=>{
             let dateTime='';
             let dateTime='';
             let year=newDate.getFullYear();//获取当前年
             let year=newDate.getFullYear();//获取当前年
-            let month=timeFormat(newDate.getMonth()+1);//获取当前月
+            let month1=(newDate.getMonth()+1)+'';
+            let month=timeFormat(month1);//获取当前月
             let day=timeFormat(newDate.getDate());//获取当前日
             let day=timeFormat(newDate.getDate());//获取当前日
             let hours=timeFormat(newDate.getHours()+'');//获取当前时
             let hours=timeFormat(newDate.getHours()+'');//获取当前时
             let minutes=timeFormat(newDate.getMinutes()+'');//获取当前分
             let minutes=timeFormat(newDate.getMinutes()+'');//获取当前分
@@ -281,6 +282,8 @@ export default {
             if(props.dateValueData && props.dateValueData.length>0){
             if(props.dateValueData && props.dateValueData.length>0){
                 dateValue.value=props.dateValueData
                 dateValue.value=props.dateValueData
                 changeDate(dateValue.value);
                 changeDate(dateValue.value);
+            }else{
+                oneDay();
             }
             }
                 checkedId.value=props.intervalGroup;
                 checkedId.value=props.intervalGroup;
         }
         }
@@ -304,12 +307,19 @@ export default {
             });
             });
         }
         }
 
 
+        const oneDay=()=>{
+            const end = getDateTime(new Date());
+            const start = formatDate(1,'d');
+            dateValue.value=[start,end]
+            changeDate(dateValue.value)
+
+        }
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             isDetail();
             isDetail();
-
         })
         })
         return {
         return {
+            oneDay,
             commandVal,
             commandVal,
             calcDayNum,
             calcDayNum,
             calcDay,
             calcDay,

@@ -41,7 +41,7 @@
         </el-table-column>
         </el-table-column>
     </el-table>
     </el-table>
     <!-- 分页 -->
     <!-- 分页 -->
-    <div style='text-align: center;background-color: white' v-if="showPage">
+    <div style='text-align: left;background-color: white' v-if="showPage">
         <el-pagination
         <el-pagination
                 @size-change="handleSizeChange"
                 @size-change="handleSizeChange"
                 @prev-click="prePage"
                 @prev-click="prePage"

@@ -51,7 +51,10 @@ export default {
         // 展示组件
         // 展示组件
         layout: {
         layout: {
             type: String,
             type: String,
-            default: "total, prev,pager,next,   sizes, jumper"
+            // Start Wang 2022/1/19 14:22 上一页和下一页切花不生效，暂无解决办法
+            //default: "total, prev,pager,next,   sizes, jumper"
+            default: "total, pager,sizes, jumper"
+            // End Wang 2022/1/19 14:22
         },
         },
         // 列
         // 列
         columns: {
         columns: {
@@ -159,7 +162,7 @@ export default {
         let prePage = (val) => {
         let prePage = (val) => {
             // console.log(`当前页: ${val}`)
             // console.log(`当前页: ${val}`)
             // props.currentPage = val - 1;
             // props.currentPage = val - 1;
-            currentPage.value = val;
+            currentPage.value = val-1;
             callback();
             callback();
         }
         }
 
 
@@ -167,7 +170,7 @@ export default {
         let nextPage = (val) => {
         let nextPage = (val) => {
             // console.log(`当前页: ${val}`)
             // console.log(`当前页: ${val}`)
             // props.currentPage = val + 1;
             // props.currentPage = val + 1;
-            currentPage.value = val;
+            currentPage.value = val+1;
             callback();
             callback();
         }
         }
 
 

@@ -5,7 +5,7 @@
                 <el-row style="margin-bottom: 5px;margin-top: 5px">
                 <el-row style="margin-bottom: 5px;margin-top: 5px">
                     <el-col :span="24">
                     <el-col :span="24">
                         <div class="flex-div-start margin-top-bottom-10">
                         <div class="flex-div-start margin-top-bottom-10">
-                            <el-tooltip placement="right-end">
+                            <el-tooltip >
                                 <template #content>关键字检索包含<br />资源名称<br />IP地址</template>
                                 <template #content>关键字检索包含<br />资源名称<br />IP地址</template>
                                 <el-input style="width:160px;margin-left: 10px;float: left;" class="margin-right-10"
                                 <el-input style="width:160px;margin-left: 10px;float: left;" class="margin-right-10"
                                           v-model="keyWords"
                                           v-model="keyWords"
@@ -57,9 +57,12 @@
                             <template #default="{row,prop,column}">
                             <template #default="{row,prop,column}">
                                 <div v-if="prop == 'resName'">
                                 <div v-if="prop == 'resName'">
                                     <!-- 资源名称点击事件 -->
                                     <!-- 资源名称点击事件 -->
-                                    <el-button type="text" size="small" @click.prevent="resourceClick(row)">
-                                        <span class="">{{row.resName}}</span>
-                                    </el-button>
+                                    <el-tooltip placement="top">
+                                        <el-button type="text" size="small" @click.prevent="resourceClick(row)">
+                                            <span class="">{{row.resName}}</span>
+                                        </el-button>
+                                        <template #content>{{row.resName}}</template>
+                                    </el-tooltip>
                                 </div>
                                 </div>
                             </template>
                             </template>
                             <template #tools="{scope}">
                             <template #tools="{scope}">

@@ -129,6 +129,22 @@ export default {
         let onBtnSearch = () => {
         let onBtnSearch = () => {
             loadTableDataList({page: 1, limit: pageSize.value});
             loadTableDataList({page: 1, limit: pageSize.value});
         }
         }
+        // 切换页码
+        let prePage = (val) => {
+            // console.log(`当前页: ${val}`)
+            // props.currentPage = val - 1;
+            currentPage.value = val;
+            callback();
+        }
+
+        // 切换页码
+        let nextPage = (val) => {
+            // console.log(`当前页: ${val}`)
+            // props.currentPage = val + 1;
+            currentPage.value = val;
+            callback();
+        }
+
         // 重置
         // 重置
         let onReset = () => {
         let onReset = () => {
             keyWords.value = '';
             keyWords.value = '';

@@ -202,6 +202,14 @@ export default {
                     } else {
                     } else {
                         if (['protocolType', 'portDesc'].indexOf(e.prop) === -1 && !/^\d+$/.test(item[e.prop])) {
                         if (['protocolType', 'portDesc'].indexOf(e.prop) === -1 && !/^\d+$/.test(item[e.prop])) {
                             msg = e.label + '请输入数字';
                             msg = e.label + '请输入数字';
+                        }else{
+                            if(['protocolType', 'portDesc'].indexOf(e.prop) === -1 && item[e.prop].length>=8){
+                                msg = e.label + '不能超过8位';
+                            }else{
+                                if(['protocolType', 'portDesc'].indexOf(e.prop) === -1 && item[e.prop]<=0){
+                                    msg = e.label + '只能大于零';
+                                }
+                            }
                         }
                         }
                     }
                     }
                 })
                 })