From ff6f4ca8695b2faa6361b7d55a53128271177e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=B7=E5=86=89=E5=86=89?= <kangranran@dingxuantech.cn>
Date: Tue, 25 Nov 2025 18:34:08 +0800
Subject: [PATCH] =?UTF-8?q?MTRAgent=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E3=80=81MTR=E6=8E=A2=E6=B5=8B=E7=AD=96=E7=95=A5=E3=80=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/disRevenue/resource.js                |  25 ++++
 src/components/form/index.vue                 | 107 +++++++++++++++++-
 .../busValueCount/busValueCount.vue           |   2 +-
 .../businessIdent/businessIdent.vue           |   2 +-
 .../businessIssued/businessIssued.vue         |   2 +-
 .../businessScript/businessScript.vue         |   2 +-
 .../resource/messagePush/messagePush.vue      |   2 +-
 src/views/resource/mtrAgent/lossRateChart.vue |  51 +++++----
 src/views/resource/mtrProbe/mtrProbe.vue      |  46 +++-----
 src/views/resource/mtrProbe/mtrProbeView.vue  |  60 ++++++----
 src/views/resource/serverRegister/handle.vue  |   6 +-
 src/views/resource/serverRegister/index.vue   |  88 +++++++++++++-
 .../serverRegister/secondAutoFind.vue         |  13 +--
 .../switchRegister/secondAutoFind.vue         |  14 +--
 src/views/resource/topology/index.vue         |   2 +-
 15 files changed, 316 insertions(+), 106 deletions(-)

diff --git a/src/api/disRevenue/resource.js b/src/api/disRevenue/resource.js
index 48a7fd6..b5af3ad 100644
--- a/src/api/disRevenue/resource.js
+++ b/src/api/disRevenue/resource.js
@@ -966,6 +966,23 @@ export function dockerSpeedEcharts(data) {
     data: data
   })
 }
+// 添加标签
+export function addRemark(data) {
+  return request({
+    url: '/system/registration/addRemark',
+    method: 'post',
+    data: data
+  })
+}
+// 修改标签
+export function updateRemark(data) {
+  return request({
+    url: '/system/registration/updateRemark',
+    method: 'post',
+    data: data
+  })
+}
+
 
 /**   ----------------告警日志 ------------    */
 // 查询列表
@@ -1188,3 +1205,11 @@ export function delMtrPolicy(Ids) {
     method: 'delete'
   })
 }
+// 相关Ip查询
+export function networkInterList(data) {
+  return request({
+    url: '/rocketmq/networkInterface/list',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/components/form/index.vue b/src/components/form/index.vue
index ca31340..29eed1d 100644
--- a/src/components/form/index.vue
+++ b/src/components/form/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-width="config && config.labelWidth || '130px'" :key="config && config.key" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-width="config && config.labelWidth || '130px'" :key="config && config.key" class="demo-ruleForm" @submit.native.prevent>
         <template v-for="(formItem,index) of formList">
           <h4 v-if="formItem && formItem.config && formItem.config.title" style="color: #000;" class="form-header h4">{{formItem.config.title}}</h4>
           <el-row style="color: #606266;">
@@ -235,6 +235,37 @@
                   ></el-transfer>
                 </template>
 
+                <template v-else-if="formVal.type === 'dynamicTags'">
+                  <div class="dynamic-tags-container">
+                    <!-- 显示已存在的标签 -->
+                    <el-tag
+                      v-for="(tag, tagIndex) in ruleForm[key]"
+                      :key="tagIndex"
+                      :closable="!toBoolean(formVal.disabled || formItem.config.readonly)"
+                      :disable-transitions="false"
+                      @close="handleTagClose(key, tagIndex)"
+                      class="dynamic-tag">
+                      {{ tag }}
+                    </el-tag>
+                    <!-- 动态输入框 -->
+                    <template v-if="!toBoolean(formVal.disabled || formItem.config.readonly)">
+                      <el-input
+                        v-if="inputVisibleMap[key]"
+                        ref="tagInputRef"
+                        v-model="inputValueMap[key]"
+                        class="input-new-tag"
+                        size="small"
+                        @keyup.enter.native="handleInputConfirm(key)"
+                        @blur="handleInputConfirm(key)"
+                        @keyup.delete="handleDeleteWhenEmpty(key)"
+                        style="width: 100px">
+                      </el-input>
+                      <!-- 添加新标签的按钮 -->
+                      <el-button v-else class="button-new-tag" size="small" @click="showInput(key)">+ 新标签</el-button>
+                    </template>
+                  </div>
+                </template>
+
                 <!-- 自定义插槽，用于特殊类型的表单控件 -->
                 <template v-else-if="formVal.slotName">
                   <slot :name="formVal.slotName" :field="formVal"></slot>
@@ -292,6 +323,9 @@
         //   {porp: 'name', label: '姓名', span: 24, type: 'input',rules: {required: true, message: '请输入活动名称', trigger: 'blur'}},
         //   {porp: 'age', label: '下拉', span: 24, type: 'select',options:[{value: '1', label: '10'},{value: '2', label: '20'}]},
         // ],
+        inputVisibleMap: {},    // 记录每个字段的输入框显示状态
+        inputValueMap: {},      // 记录每个字段的输入值
+        tagInputRef: null       // 输入框引用
       };
     },
     watch: {
@@ -407,6 +441,56 @@
           }
         }
       },
+      // 显示输入框 tag
+      showInput(fieldKey) {
+        // 1. 先显示输入框
+        this.$set(this.inputVisibleMap, fieldKey, true);
+        // 初始化该字段的数组（如果尚未初始化）
+        if (!Array.isArray(this.ruleForm[fieldKey])) {
+          this.$set(this.ruleForm, fieldKey, []);
+        }
+
+        // 设置该字段的输入框为可见状态
+        this.$set(this.inputValueMap, fieldKey, '');
+
+        // 下一个tick聚焦输入框
+        this.$nextTick(() => {
+          if (this.$refs.tagInputRef && this.$refs.tagInputRef[0].focus) {
+            this.$refs.tagInputRef[0].focus();
+          }
+        });
+      },
+
+      // 确认输入 tag
+      handleInputConfirm(fieldKey) {
+        const inputValue = this.inputValueMap[fieldKey]?.trim();
+
+        if (inputValue) {
+          // 避免重复标签
+          if (!this.ruleForm[fieldKey].includes(inputValue)) {
+            this.ruleForm[fieldKey].push(inputValue);
+            // 触发change事件
+            this.handleChange(fieldKey, this.ruleForm[fieldKey], this.formVal);
+          }
+        }
+        // 重置输入状态
+        this.$set(this.inputVisibleMap, fieldKey, false);
+        this.$set(this.inputValueMap, fieldKey, '');
+      },
+
+      // 删除标签 tag
+      handleTagClose(fieldKey, tagIndex) {
+        this.ruleForm[fieldKey].splice(tagIndex, 1);
+        // 触发change事件
+        this.handleChange(fieldKey, this.ruleForm[fieldKey], this.formVal);
+      },
+
+      // 当输入框为空时按删除键，隐藏输入框 tag
+      handleDeleteWhenEmpty(fieldKey) {
+        if (!this.inputValueMap[fieldKey]) {
+          this.$set(this.inputVisibleMap, fieldKey, false);
+        }
+      }
     }
   }
 </script>
@@ -439,5 +523,26 @@
   ::v-deep .labelWidthNullSty .el-form-item__content {
     margin-left: 0px!important;
   }
+
+  .dynamic-tags-container {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 8px;
+    padding: 5px 0;
+  }
+
+  .dynamic-tag {
+    margin: 2px;
+  }
+
+  .input-new-tag {
+    width: 100px;
+  }
+
+  .button-new-tag {
+    margin-left: 0;
+  }
+
 </style>
 
diff --git a/src/views/earnManage/busValueCount/busValueCount.vue b/src/views/earnManage/busValueCount/busValueCount.vue
index fc2ce71..9e19e65 100644
--- a/src/views/earnManage/busValueCount/busValueCount.vue
+++ b/src/views/earnManage/busValueCount/busValueCount.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="80px" class="demo-ruleForm">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="80px" class="demo-ruleForm" @submit.native.prevent>
       <el-col :span="8">
         <el-form-item label="任务名称" prop="taskName">
           <el-input
diff --git a/src/views/earnManage/businessIdent/businessIdent.vue b/src/views/earnManage/businessIdent/businessIdent.vue
index b92d7ec..64253b7 100644
--- a/src/views/earnManage/businessIdent/businessIdent.vue
+++ b/src/views/earnManage/businessIdent/businessIdent.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="68px" class="demo-ruleForm">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="68px" class="demo-ruleForm" @submit.native.prevent>
       <el-col :span="6">
         <el-form-item label="业务名称" prop="businessName">
           <el-input
diff --git a/src/views/earnManage/businessIssued/businessIssued.vue b/src/views/earnManage/businessIssued/businessIssued.vue
index c61b7fe..f0f4e4a 100644
--- a/src/views/earnManage/businessIssued/businessIssued.vue
+++ b/src/views/earnManage/businessIssued/businessIssued.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="68px" class="demo-ruleForm">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="68px" class="demo-ruleForm" @submit.native.prevent>
       <el-col :span="6">
         <el-form-item label="任务名称" prop="taskName">
           <el-input
diff --git a/src/views/earnManage/businessScript/businessScript.vue b/src/views/earnManage/businessScript/businessScript.vue
index 1529f36..75deff1 100644
--- a/src/views/earnManage/businessScript/businessScript.vue
+++ b/src/views/earnManage/businessScript/businessScript.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="68px" class="demo-ruleForm">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="68px" class="demo-ruleForm" @submit.native.prevent>
       <el-col :span="6">
         <el-form-item label="脚本名称" prop="scriptName">
           <el-input
diff --git a/src/views/resource/messagePush/messagePush.vue b/src/views/resource/messagePush/messagePush.vue
index fd4e44a..5c6ff76 100644
--- a/src/views/resource/messagePush/messagePush.vue
+++ b/src/views/resource/messagePush/messagePush.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" size="small" v-show="showSearch" label-width="auto">
+    <el-form :model="queryParams" ref="queryRef" size="small" v-show="showSearch" label-width="auto" @submit.native.prevent>
       <el-col :span="6">
         <el-form-item label="配置名称" prop="configName">
           <el-input
diff --git a/src/views/resource/mtrAgent/lossRateChart.vue b/src/views/resource/mtrAgent/lossRateChart.vue
index d1f34bf..c5b60a6 100644
--- a/src/views/resource/mtrAgent/lossRateChart.vue
+++ b/src/views/resource/mtrAgent/lossRateChart.vue
@@ -5,7 +5,7 @@
         <el-collapse-item :title="`【${val && val.title || ''}】${val && val.jointName || ''}`" :name="val && val.title || ''">
           <div class="mt10 w100">
             <div v-for="item of val && val.echartList || []" :key="`div-${val && val.title || ''}-${item && item.title || ''}-${index}`" class="w100" style="height: 200px;">
-              <EchartsLine class="w100 h100" :key="`chart-${val && val.title || ''}-${item && item.title || ''}-${index}`" :lineData="item && item.dataVal || {}" :dateDataTrans="item && item.dateDataTrans || {}" :dateShowType="item && item.dateShowType || 'datetimerange'" :title="item && item.title || '图表数据'" :chartData="(valData, unit) => chartDataEvent(valData, item.fnEvent,val.title, unit)"></EchartsLine>
+              <EchartsLine class="w100 h100" :key="`chart-${val && val.title || ''}-${item && item.title || ''}-${index}`" :lineData="item && item.dataVal || {}" :dateDataTrans="item && item.dateDataTrans || {}" :dateShowType="item && item.dateShowType || 'datetimerange'" :title="item && item.title || '图表数据'" :chartData="(valData) => chartDataEvent(valData,val.title)"></EchartsLine>
             </div>
           </div>
         </el-collapse-item>
@@ -33,10 +33,10 @@
             yAxisName: ' ',
             gridTop: '35%',
             legend: {},
-            lineXData: ['2025-9-1', '2025-9-2', '2025-9-3', '2025-9-4', '2025-9-5', '2025-9-6', '2025-9-7'],
+            lineXData: [],
             dataList: [{
               name: '',
-              data: [220, 182, 191, 234, 290, 330, 310]
+              data: []
             }]
           }
         }],
@@ -69,23 +69,28 @@
           let dataList = {};
           res && res.data.forEach(item => {
             this.activeShowList.push(item.clientId);
-            // let chartList = JSON.parse(JSON.stringify(this.echartList));
-            // chartList[0].dateDataTrans['dateRange'] = this.defaultTimes;
             item['title'] = item.clientId;
             item['jointName'] = '丢包率';
-            // item['echartList'] = chartList;
             dataList[item.clientId] = item;
-            // this.getEchartList(dataList, item.clientId);
           });
           this.chartDataLit = dataList;
+          this.getEchartList(dataList);
         });
       },
-      getEchartList(content, key) {
-        console.log('content===',content);
-        console.log('key===',key);
-        lossRateByMtr({}).then(res => {
-
-        });
+      getEchartList(resVal) {
+        if (resVal && Object.keys(resVal).length > 0) {
+          Object.keys(resVal).forEach(item => {
+            let chartList = JSON.parse(JSON.stringify(this.echartList))[0];
+            chartList.dateDataTrans['dateRange'] = this.defaultTimes;
+            lossRateByMtr(Object.assign({}, {clientId: resVal[item].clientId, mtrClientId: resVal[item].mtrClientId}, this.currTimeList)).then(res => {
+              if (res && res.data) {
+                chartList.dataVal.lineXData = res.data && res.data.xData || [];
+                chartList.dataVal.dataList[0].data = res.data && res.data.yData && res.data.yData.packetLossRate || [];
+                this.$set(this.chartDataLit, item, Object.assign({}, this.chartDataLit[item], {echartList: [chartList]}));
+              }
+            });
+          })
+        }
       },
       collapseChange(val) {
         this.activeShowList = val;
@@ -93,18 +98,14 @@
         //   this.$emit("collapseChangeData", val);
         // }
       },
-      chartDataEvent(valData, funcName, tabName, unit) {
-        // console.log('valData===',valData);
-        // console.log('funcName===',funcName);
-        // console.log('tabName===',tabName);
-        // console.log('unit===',unit);
-        // // 检查函数是否存在，避免报错
-        // if (typeof this[funcName] === 'function') {
-        //   // 调用实际函数，并传递参数（如选中的值、当前项）
-        //   // this[funcName]({startTime: valData[0], endTime: valData[1]});
-        // } else {
-        //   console.warn(`函数 ${funcName} 未定义`);
-        // }
+      chartDataEvent(valData, tabName) {
+        if (valData && valData.timeArr) {
+          this.currTimeList = {startTime: valData.timeArr[0], endTime: valData.timeArr[1]};
+          this.defaultTimes = valData.timeArr;
+          let params = {};
+          params[tabName] = this.chartDataLit[tabName];
+          this.getEchartList(params);
+        }
       }
     }
   }
diff --git a/src/views/resource/mtrProbe/mtrProbe.vue b/src/views/resource/mtrProbe/mtrProbe.vue
index 7629c72..9741864 100644
--- a/src/views/resource/mtrProbe/mtrProbe.vue
+++ b/src/views/resource/mtrProbe/mtrProbe.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="auto">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="auto" @submit.native.prevent>
       <el-col :span="6">
         <el-form-item label="搜索" title="搜索" prop="queryName">
           <el-input
@@ -20,24 +20,13 @@
 
     <!-- 表格数据 -->
     <TableList :columns="columns" :config="config" :modelIdent="this.$options.name" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
-      <template #tempCopy="{ row, column}">
-        {{row.clientId}}<el-link :underline="false" icon="el-icon-document-copy" title="复制" v-clipboard:copy="row.clientId" v-clipboard:success="clipboardSuccess" style="margin-left: 10px;color: #409EFF;"></el-link>
+      <!--   是否探测   -->
+      <template #tempProbe="{ row, column }">
+        <dict-tag :options="dict.type.rm_register_snmp_detect" :value="row.probeFlag"/>
       </template>
-      <!--   更新方式   -->
-      <template #tempMethod="{ row, column }">
-        <dict-tag :options="dict.type.policy_method" :value="row.method"/>
-      </template>
-      <!--    多公网IP状态    -->
-      <template #tempMultipubStatus="{ row, column }">
-        <dict-tag :options="dict.type.rm_moreip_status" :value="row.multiPublicIpStatus"/>
-      </template>
-      <!--    注册状态    -->
-      <template #tempStatus="{ row, column }">
-        <dict-tag :options="dict.type.rm_register_status" :value="row.registerStatus"/>
-      </template>
-      <!--    在线状态    -->
-      <template #tempOnlineStatus="{ row, column }">
-        <dict-tag :options="dict.type.rm_register_online_state" :value="row.onlineStatus"/>
+      <!--   探测频率   -->
+      <template #tempProbeFre="{ row, column }">
+        <div v-if="row && row.probeFrequency === '300'">固定每5分钟</div>
       </template>
     </TableList>
   </div>
@@ -50,7 +39,7 @@
   export default {
     name: 'mtrProbe',
     components: {TableList,Form},
-    dicts: ['rm_moreip_status', 'rm_register_status', 'rm_register_online_state', 'policy_method'],
+    dicts: ['rm_register_snmp_detect'],
     data() {
       return {
         roleList: [],
@@ -62,14 +51,14 @@
           id: { label: `ID`,width: '50'},
           mtrTC: { label: `MTR探测策略`, minWidth: '120'},
           policyName: { label: `策略名称`, minWidth: '120', visible: true},
-          priority: { label: `优先级`,minWidth: '150', visible: true },
+          priority: { label: `优先级`,minWidth: '60', visible: true },
           mtrClientId: { label: `MTRClientID`, minWidth: '320', visible: true},
-          serverGroup:{ label: `服务器集合`,minWidth: '90', visible: true},
-          probeFlag: { label: `是否探测`, minWidth: '100', visible: true},
-          startTime: { label: `开始时间`, minWidth: '80'},
-          endTime: { label: `结束时间`, minWidth: '100'},
-          probeFrequency: { label: `探测频率`,minWidth: '160'},
-          serveripGroup: { label: `探测目标IP集合`,minWidth: '200'},
+          serverGroup:{ label: `服务器集合`,minWidth: '320', visible: true},
+          probeFlag: { label: `是否探测`, minWidth: '80', visible: true, slotName: 'tempProbe'},
+          startTime: { label: `开始时间`, minWidth: '160'},
+          endTime: { label: `结束时间`, minWidth: '160'},
+          probeFrequency: { label: `探测频率`,minWidth: '100', slotName: 'tempProbeFre'},
+          serveripGroup: { label: `探测目标IP集合`,minWidth: '200', customTooltip: true},
           updateTime:{ label: `修改时间`,minWidth: '160'},
           createTime: { label: `创建时间`,minWidth: '160'},
         },
@@ -171,12 +160,13 @@
               });
               break;
             case 'delete':
-              let ids = '';
+              let ids = null;
               if (rowData && rowData.id) {
                 ids = rowData.id;
               } else {
                 if (selectList && selectList.length <= 0) {
                   this.$modal.msgWarning("请选择数据！");
+                  return;
                 }
                 ids = selectChange;
               }
@@ -184,7 +174,7 @@
               let content = '<p style="font-size: 1rem;font-weight: 600;">删除MTR探测策略</p>' +
                 '<p style="height: 0px;margin-bottom: 50px;">删除后数据将不能恢复，请确认是否继续！！！</p>';
               this.$modal.confirm(content).then(function() {
-                return delMtrPolicy(rowData.id)
+                return delMtrPolicy(ids)
               }).then(() => {
                 this.getList();
                 this.$modal.msgSuccess("删除成功")
diff --git a/src/views/resource/mtrProbe/mtrProbeView.vue b/src/views/resource/mtrProbe/mtrProbeView.vue
index d46e8b9..f6605fb 100644
--- a/src/views/resource/mtrProbe/mtrProbeView.vue
+++ b/src/views/resource/mtrProbe/mtrProbeView.vue
@@ -6,7 +6,7 @@
 
 <script setup name="Handle">
   import Form from '@/components/form/index.vue';
-  import {addMtrPolicy, updateMtrPolicy, getMtrPolicyt} from "@/api/disRevenue/resource"
+  import {addMtrPolicy, updateMtrPolicy, getMtrPolicyt, allMtrClientIdData, networkInterList} from "@/api/disRevenue/resource"
   export default {
     name: 'mtrProbe_view',
     components: {Form},
@@ -63,7 +63,7 @@
         this.getFormDataList(this.paramsData.id);
       } else {
         this.fnFormList();
-        // this.getResNameList();
+        this.fnMtrClientList();
       }
       if (this.paramsData && this.paramsData.readonly) {
         this.config = {
@@ -85,12 +85,12 @@
               probeFlag: {label: '是否探测', span: 12, type: 'radio', eventName: 'change',required: true, options: this.dict.type.rm_register_snmp_detect},
               startTime: {label: '开始时间', span: 12, type: 'datetime', hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true},
               endTime: {label: '结束时间', span: 12, type: 'datetime', hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true},
-              probeFrequency: {label: '探测频率', span: 12, type: 'select', options: [], hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true},
+              probeFrequency: {label: '探测频率', span: 12, type: 'select', options: [{value: '300', label: '固定每5分钟'}], hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true},
               updateTime: {label: '修改时间', span: 12, type: 'datetime'},
               createTime: {label: '创建时间', span: 12, type: 'datetime'},
-              createBy: {label: '创建人', span: 12, type: 'datetime'},
+              createBy: {label: '创建人', span: 12, type: 'input'},
               serverGroup: {label: '服务器集合', span: 12, type: 'textarea', rows:15, placeholder: '请粘贴/输入ClientID列表，如\nClientID1\nClientID2\n...', required: true},
-              serveripGroup: {label: '探测目标IP集合', span: 12, type: 'input'},
+              serveripGroup: {label: '探测目标IP集合', span: 12, type: 'textarea', rows:15},
             }
           }];
         } else {
@@ -102,11 +102,11 @@
               mtrClientId: {label: 'MTRClientID', span: 18, type: 'select', required: true, options: []},
               serverGroup: {label: '服务器集合', span: 15, type: 'textarea', rows:15, placeholder: '请粘贴/输入ClientID列表，如\nClientID1\nClientID2\n...', required: true},
               clientAllId: {label: '显示相关IP', span: 3, type: 'button', style: 'vertical-align: top'},
-              serveripGroup: {label: '', span: 5, labelWidthNull: true, type: 'textarea', rows:15, placeholder: 'IP1\nIP2\nIP3\n...', hidden: this.ruleForm && this.ruleForm.clientAllId ? false: true},
+              serveripGroup: {label: '', span: 5, labelWidthNull: true, type: 'textarea', rows:15, placeholder: 'IP1\nIP2\nIP3\n...', hidden: this.ruleForm && this.ruleForm.serveripGroup ? false: true},
               probeFlag: {label: '是否探测', span: 18, type: 'radio', eventName: 'change',required: true, options: this.dict.type.rm_register_snmp_detect},
               startTime: {label: '开始时间', span: 18, type: 'datetime', eventName: 'change', pickerOptions: {}, hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true},
               endTime: {label: '结束时间', span: 18, type: 'datetime', eventName: 'change', pickerOptions: {}, hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true},
-              probeFrequency: {label: '探测频率', span: 18, type: 'select', options: [], hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true},
+              probeFrequency: {label: '探测频率', span: 18, type: 'select', options: [{value: '300', label: '固定每5分钟'}], hidden: this.ruleForm && this.ruleForm.probeFlag === '1' ? false: true},
             }
           }];
         }
@@ -115,13 +115,31 @@
       getFormDataList(id) {
         getMtrPolicyt(id).then(val => {
           if (val && val.data) {
-            this.fnFormList(val.data);
+            val.data['probeFlag'] = val.data['probeFlag'].toString();
+            val.data['serverGroup'] = val.data['serverGroup'].replace(/;/g, '\n');
+            if (val.data && val.data['serveripGroup']) {
+              if (this.paramsData && this.paramsData.readonly) {
+                val.data['serveripGroup'] = val.data && val.data['serveripGroup'] ? val.data['serveripGroup'].replace(/;/g, '<br>') : val.data['serveripGroup'];
+              } else {
+                val.data['serveripGroup'] = val.data && val.data['serveripGroup'] ? val.data['serveripGroup'].replace(/;/g, '\n') : val.data['serveripGroup'];
+              }
+            }
+            val.data['probeFrequency'] = val.data && val.data['probeFrequency'] ? val.data['probeFrequency'].toString() : null;
             this.ruleForm = val.data;
+            this.fnFormList();
+            this.fnMtrClientList();
           }
         }).catch(() => {
           // this.$modal.msgError("操作失败")
         });
       },
+      fnMtrClientList() {
+        allMtrClientIdData({}).then(res => {
+          this.formList[0].controls.mtrClientId['options'] = res && res.data.map(item => {
+            return Object.assign({label: item.mtrClientId, value: item.mtrClientId});
+          });
+        });
+      },
       // 监听事件
       callback(result, dataVal, formVal) {
         if (result && result.fnCode) {
@@ -130,11 +148,11 @@
               if (dataVal === '1') {
                 this.formList[0].controls.startTime['hidden'] = false;
                 this.formList[0].controls.endTime['hidden'] = false;
-                this.formList[0].controls.probe['hidden'] = false;
+                this.formList[0].controls.probeFrequency['hidden'] = false;
               } else {
                 this.formList[0].controls.startTime['hidden'] = true;
                 this.formList[0].controls.endTime['hidden'] = true;
-                this.formList[0].controls.probe['hidden'] = true;
+                this.formList[0].controls.probeFrequency['hidden'] = true;
               }
               break;
             case 'startTime':
@@ -154,6 +172,8 @@
               };
               break;
             case 'clientAllId':
+              this.ruleForm = Object.assign({}, this.ruleForm, this.$refs.formRef.$refs.ruleForm.model);
+              let params = JSON.parse(JSON.stringify(this.ruleForm));
               if (this.ruleForm && this.ruleForm.clientAllId) {
                 this.formList[0].controls.serveripGroup['hidden'] = true;
                 this.formList[0].controls.clientAllId['label'] = '显示相关IP';
@@ -164,17 +184,19 @@
                 this.formList[0].controls.clientAllId['label'] = '不显示相关IP';
                 this.$set(this.ruleForm, 'clientAllId', true);
                 this.$set(this.ruleForm, 'serveripGroup', '');
-              }
-              return;
-              getRegistList({resourceType: 1}).then(res => {
-                let str = '';
-                if (res && res.data) {
-                  res && res.data.map(item => {
-                    str+= item.clientId + '\n';
+                if (params && params.serverGroup) {
+                  networkInterList({clientIds: params.serverGroup.replace(/\n/g, ',')}).then(res => {
+                    console.log(res);
+                    let str = '';
+                    if (res && res.data) {
+                      res && res.data.map(item => {
+                        str+= item.publicIp + '\n';
+                      });
+                    }
+                    this.$set(this.ruleForm, 'serveripGroup', str);
                   });
                 }
-                this.$set(this.ruleForm, 'serveripGroup', str);
-              });
+              }
               break;
             case 'submit':
               let fnType = addMtrPolicy;
diff --git a/src/views/resource/serverRegister/handle.vue b/src/views/resource/serverRegister/handle.vue
index bc69827..25d8da7 100644
--- a/src/views/resource/serverRegister/handle.vue
+++ b/src/views/resource/serverRegister/handle.vue
@@ -104,6 +104,7 @@
               onboardTime: {label: '上机时间', span: 12, type: 'input'},
               agentVersion: {label: 'agent版本', span: 12, type: 'input'},
               machineCode: {label: '金山machineCode', span: 12, type: 'input'},
+              remark: {label: '标签', span: 12, type: 'dynamicTags'},
             }
           }];
         } else {
@@ -143,7 +144,10 @@
           fnName = getAlarmLogServerMsg;
         }
         fnName(params).then(val => {
-          this.ruleForm = val && val.data;
+          if (val && val.data) {
+            val.data['remark'] = val.data && val.data['remark'] ? val.data['remark'].split(',') : null;
+            this.ruleForm = val && val.data;
+          }
         }).catch(() => {
           this.$modal.msgError("操作失败")
         });
diff --git a/src/views/resource/serverRegister/index.vue b/src/views/resource/serverRegister/index.vue
index fb640fb..039b1ef 100644
--- a/src/views/resource/serverRegister/index.vue
+++ b/src/views/resource/serverRegister/index.vue
@@ -105,6 +105,12 @@
         <template #tempOnlineStatus="{ row, column }">
           <dict-tag :options="dict.type.rm_register_online_state" :value="row.onlineStatus"/>
         </template>
+        <!--    标签    -->
+        <template #tempRemark="{ row, column }">
+          <template v-if="row.remark">
+            <el-tag v-for="(item, index) of row.remark.split(',')" :style="{marginLeft: index !== 0 ? '5px' : null}">{{item}}</el-tag>
+          </template>
+        </template>
       </TableList>
       <!--    查看执行结果弹窗    -->
       <el-dialog title="命令执行结果" :visible.sync="open" width="800px" height="300px" append-to-body>
@@ -139,12 +145,21 @@
           <el-button @click="callback({fnCode: 'cancel'})">取消</el-button>
         </div>
       </el-dialog>
+      <!--   标签    -->
+      <el-dialog :title="tagTitle" :visible.sync="tagOpen" width="800px" append-to-body style="padding-bottom: 20px;">
+        <div v-if="!(tagRuleForm && tagRuleForm.id)" style="margin-left: 20px; margin-bottom: 10px; color: #989898; font-size: 12px;">此页面只会对所选服务器增加标签，不能查看和删除服务器原有的标签</div>
+        <Form ref="tagFormRef" :formList="tagFormList" :ruleFormData="tagRuleForm" :config="{labelWidth: '140px', buttonGroup: []}" @fnClick="callback"></Form>
+        <div style="text-align: right;margin-right: 20px;margin-bottom: 20px;">
+          <el-button type="primary" style="margin-left: 10px;" @click="submitTag">提交</el-button>
+          <el-button @click="callback({fnCode: 'cancel'})">取消</el-button>
+        </div>
+      </el-dialog>
     </div>
 </template>
 
 <script setup name="Register">
     import Form from '@/components/form/index.vue';
-    import {listHandle, networkList, getScriptResultBySn, getLogicalNode} from '@/api/disRevenue/resource';
+    import {listHandle, networkList, getScriptResultBySn, getLogicalNode, addRemark, updateRemark} from '@/api/disRevenue/resource';
     import {listAllBusinessList} from "@/api/disRevenue/earnManage"
     import TableList from '@/components/table/index.vue';
     import MonitorStrategy from '../serverMonitorStrat/monitorStrategy';
@@ -172,7 +187,7 @@
             hardwareSn: { label: `设备SN`,minWidth: '120'},
             ip1Isp: { label: `IP1-运营商`, visible: true, minWidth: '85'},
             ip1Province: { label: `IP1-省`, visible: true, minWidth: '60'},
-            ip1City: { label: `IP1-市`, minWidth: '60'},
+            ip1City: { label: `IP1-市`, minWidth: '80'},
             ip1PublicIp:{ label: `IP1-业务公网`,visible: true,minWidth: '120'},
             ip1InterfaceName: { label: `IP1-接口名称`, minWidth: '100'},
             ip1MacAddress: { label: `IP1-mac地址`, minWidth: '120'},
@@ -206,6 +221,7 @@
             mgmtInterfaceType: { label: `管理网-接口类型`, minWidth: '120'},
             mgmtIpv4Address: { label: `管理网-IPv4地址`, minWidth: '120'},
             mgmtGateway: { label: `管理网-网关`, minWidth: '120'},
+            remark: { label: `标签`, minWidth: '150', slotName: 'tempRemark'},
             heartbeatInterval: { label: `心跳时间间隔`, minWidth: '100'},
             heartbeatCount: { label: `心跳次数`, minWidth: '80'},
             registrationStatus: { label: `注册状态`, slotName: 'tempStatus', minWidth: '80', visible: true },
@@ -223,6 +239,7 @@
               top: [
                 {content: '添加金山machineCode', fnCode: 'add', type: 'primary', icon: 'el-icon-plus', hasPermi: 'resource:serverRegister:add'},
                 {content: '修改业务名称', fnCode: 'edit', type: 'success', icon: 'el-icon-edit', hasPermi: 'resource:serverRegister:edit'},
+                {content: '批量增加标签', fnCode: 'tagRemark', type: 'primary', icon: 'el-icon-plus', hasPermi: 'resource:serverRegister:tagRemark'},
                 {content: '导出', fnCode: 'export', type: 'warning', icon: 'el-icon-download', hasPermi: 'resource:serverRegister:export'},
               ],
               line: [
@@ -234,6 +251,7 @@
                     {content: '下发脚本策略', fnCode: 'issueScript', type: 'text', icon: 'el-icon-circle-check', hasPermi: 'resource:serverRegister:issueScript'},
                     {content: '下发监控策略', fnCode: 'issueMonitor', type: 'text', icon: 'el-icon-circle-check', hasPermi: 'resource:serverRegister:issueMonitor'},
                     {content: '查看执行结果', fnCode: 'result', type: 'text', icon: 'el-icon-s-check', hasPermi: 'resource:serverRegister:result'},
+                    {content: '修改标签', fnCode: 'tagRemark', type: 'text', icon: 'el-icon-s-check', hasPermi: 'resource:serverRegister:result'},
                   ]
                 }
                 // {content: '注册', fnCode: 'enroll', showName: 'registrationStatus', showVal: '0', type: 'text', icon: 'el-icon-circle-check', hasPermi: 'resource:register:enroll'},
@@ -271,7 +289,17 @@
           ipContentList: {},
           dialogRowData: {},
           logicalNodeList: [],
-
+          tagTitle: '',
+          tagOpen: false,
+          tagFormList: [{
+            config: {title: '',labelWidth: '140px', colSpan: 'disBlock m0Auto'},
+            controls: {
+              id: {label: 'ID',hidden: true},
+              remark: {label: '标签', span: 18, type: 'dynamicTags'},
+              deployDevice: {label: '相关服务器', span: 18, type: 'textarea', rows: 10, required: true},
+            }
+          }],
+          tagRuleForm: {},
         }
       },
       created() {
@@ -379,6 +407,42 @@
                   query: {clientId: rowData.clientId}
                 });
                 break;
+              case 'tagRemark':
+                this.tagOpen = true;
+                this.tagRuleForm = {remark: null, deployDevice: ''};
+                this.$nextTick(() => {
+                  // 5. 最后执行重置
+                  if (this.$refs['tagFormRef']?.$refs.ruleForm) {
+                    this.$refs['tagFormRef'].$refs.ruleForm.resetFields();
+                  }
+                  this.tagFormList[0].controls.deployDevice['disabled'] = false;
+                  if (rowData && rowData.id) {
+                    this.tagTitle = '修改标签';
+                    this.tagRuleForm = {
+                      id: rowData.id,
+                      deployDevice: rowData.clientId,
+                      remark: rowData && rowData.remark ? rowData.remark.split(',') : null
+                    };
+                    this.tagFormList[0].controls.deployDevice['disabled'] = true;
+                  } else {
+                    this.tagTitle = '批量增加标签';
+                    if (selectList && selectList.length > 0) {
+                      let params = '';
+                      selectList && selectList.forEach((item, index) => {
+                        if (selectList.length === index + 1) {
+                          params+= item.clientId;
+                        } else {
+                          params+= item.clientId + '\n'
+                        }
+                      });
+                      this.tagRuleForm = {
+                        deployDevice: params,
+                        remark: null
+                      };
+                    }
+                  }
+                });
+                break;
               case 'result':
                 this.timelineList = [];
                 // 获取详情
@@ -461,6 +525,7 @@
               case 'cancel':
                 this.issueOpen = false;
                 this.pubilcNetOpen = false;
+                this.tagOpen = false;
                 break;
               case 'export':
                 // let dataList = [];
@@ -486,7 +551,7 @@
             // 3. 操作form（如验证）
             formValid.validate((valid) => {
               if (valid) {
-                if (formValid.model?.deployDevice) {
+                if (formValid.model?.deployDevice && Array.isArray(formValid.model.deployDevice)) {
                   formValid.model.deployDevice = formValid.model.deployDevice.join('/n');
                 }
                 this[`${model}`] = formValid.model;
@@ -533,6 +598,21 @@
             this.getList();
           });
         },
+        // 添加标签
+        async submitTag() {
+          if (!await this.fnFormValid('tagFormRef', 'tagRuleForm')) return;
+          let params = JSON.parse(JSON.stringify(this.tagRuleForm));
+          params['remark'] = params && params.remark && params.remark.length > 0 ? params.remark.join() : null;
+          let fnType = addRemark;
+          if (params && params.id) {
+            fnType = updateRemark;
+          }
+          fnType(params).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            this.tagOpen = false;
+            this.getList();
+          });
+        },
       }
     }
 </script>
diff --git a/src/views/resource/serverRegister/secondAutoFind.vue b/src/views/resource/serverRegister/secondAutoFind.vue
index 32adc3d..90e7afa 100644
--- a/src/views/resource/serverRegister/secondAutoFind.vue
+++ b/src/views/resource/serverRegister/secondAutoFind.vue
@@ -37,20 +37,9 @@
       },
     },
     watch: {
-      activeNames: {
-        handler(val) {
-          console.log();
-          // 因加入了fnFilterData方法进行了筛选排序，导致默认打开的不为原指定的元素了，这里就没用了
-          // this.activeShowList = val;
-        },
-        deep: true,
-        immediate: true
-      },
       secondChartList: {
         handler(val) {
           this.chartDataLit = this.fnFilterData(val);
-          // 因加入了fnFilterData方法进行了筛选排序，导致默认打开的不为原指定的元素了，这里就没用了
-          // this.activeShowList = val;
         },
         deep: true,
         immediate: true
@@ -79,7 +68,7 @@
           newObj[key] = chartList[key];
         });
         // 默认打开hasKeys的所有元素
-        if (newObj && Object.keys(newObj).length > 0 && this.activeShowList && this.activeShowList <= 0) {
+        if (newObj && Object.keys(newObj).length > 0) {
           let selectData = hasKeys && hasKeys.length > 0 ? hasKeys : [Object.keys(newObj)[0]];
           this.collapseChange(selectData);
         }
diff --git a/src/views/resource/switchRegister/secondAutoFind.vue b/src/views/resource/switchRegister/secondAutoFind.vue
index d3b80df..8435ef7 100644
--- a/src/views/resource/switchRegister/secondAutoFind.vue
+++ b/src/views/resource/switchRegister/secondAutoFind.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="padding: 8px 20px 20px;">
     <el-collapse v-model="activeShowList" @change="collapseChange">
-      <el-collapse-item v-for="(val,key, index) of secondChartList" :title="`【${val && val.title || ''}】`" :name="key || ''">
+      <el-collapse-item v-for="(val,key, index) of chartDataLit" :title="`【${val && val.title || ''}】`" :name="key || ''">
         <div class="mt10 w100">
           <div class="w100 plr-20" style="font-size: 14px">
             <div v-for="(item,key,index) of val && val.formList || []" :key="`${key}-${index}`"  class="w50 disInlineBlock p10">
@@ -34,13 +34,6 @@
       },
     },
     watch: {
-      activeNames: {
-        handler(val) {
-          // this.activeShowList = val;
-        },
-        deep: true,
-        immediate: true
-      },
       secondChartList: {
         handler(val) {
           this.chartDataLit = this.fnFilterData(val);
@@ -53,7 +46,8 @@
     },
     data() {
       return {
-        activeShowList: []
+        activeShowList: [],
+        chartDataLit: {},
       }
     },
     created() {},
@@ -73,7 +67,7 @@
           newObj[key] = chartList[key];
         });
         // 默认打开hasKeys的所有元素
-        if (newObj && Object.keys(newObj).length > 0 && this.activeShowList && this.activeShowList <= 0) {
+        if (newObj && Object.keys(newObj).length > 0) {
           let selectData = hasKeys && hasKeys.length > 0 ? hasKeys : [Object.keys(newObj)[0]];
           this.collapseChange(selectData);
         }
diff --git a/src/views/resource/topology/index.vue b/src/views/resource/topology/index.vue
index 2e2f405..a60b47b 100644
--- a/src/views/resource/topology/index.vue
+++ b/src/views/resource/topology/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="app-container pageTopForm">
-        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px" @submit.native.prevent>
           <el-col :span="6">
               <el-form-item label="交换机名称" prop="switchName">
                   <el-input