Merge branch 'master-V32-XuHaoJie' into 'master'

通用-端口侦测-端口侦测细节优化



See merge request !367

@@ -162,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();
         }
         }
 
 
@@ -170,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 + '只能大于零';
+                                }
+                            }
                         }
                         }
                     }
                     }
                 })
                 })