Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -97,6 +97,10 @@ export default {
         //添加应用
         let addRes=(row,index)=>{
             // row.targetId=proxy.targetId;
+            if(row.checked){
+                proxy.$global.showMsg('数据已存在，请勿重复添加','warning');
+                return;
+            }
             let npmList=row;
             npmList.dataScope=120;
             let params={

@@ -467,7 +467,7 @@
         <!--APM弹框-->
         <APM v-show="APMVisible" :isDisplay="APMVisible"  :apmMonitorList="apmMonitorList"  :propsData="propsData" @callbackAPM="getAPMList"></APM>
         <!--拨测分析弹框-->
-        <DialTest v-show="dialtestMonitorVisible" :isDisplay="dialtestMonitorVisible" :dialtestMonitorList="dialtestMonitorList" :propsData="propsData"  @callbackApp="getDialtestMoniList"></DialTest>
+        <DialTest v-show="dialtestMonitorVisible" :isDisplay="dialtestMonitorVisible" :dialtestMonitorList="dialtestMonitorList" :propsData="propsData"  @callbackDialtest="getDialtestMoniList"></DialTest>
         <!--日志监测弹框-->
         <LogMonition v-if="logMonitionVisible" :propsData="propsData" @callbackLog="getLogMonitionList"></LogMonition>
         <!--订阅人员弹框-->

@@ -112,6 +112,8 @@ export default {
     setup(props){
         const {proxy} = Vue.getCurrentInstance();
         let applicationMonitorVisible=Vue.ref(false);
+        let dialtestMonitorVisible=Vue.ref(false);
+
         let baseVisible=Vue.ref(false);
         //btn加载中
         let isLoading=Vue.ref(false);
@@ -211,6 +213,7 @@ export default {
             baseCount,
             setDetail,
             applicationMonitorVisible,
+             dialtestMonitorVisible,
             baseVisible,
             modleId,
             ruleId,
@@ -360,7 +363,7 @@ export default {
             this.setDetailConfig(this.type)
             this.getApmListInfo();
         },
-        //拨测分析
+        //打开拨测分析
         dialtestMonitorFunc(index){
             if(!this.isSaveModel()){
                 return;
@@ -526,7 +529,6 @@ export default {
                             }
                         })
                     }
-
                     this.dialtestMonitorVisible=true;
                     break;
                 case "log":
@@ -756,7 +758,7 @@ export default {
         },
         //关闭拨测分析弹框
         getDialtestMoniList(itemData){
-            this.applicationMonitorVisible=false;
+            this.dialtestMonitorVisible=false;
             if(itemData.faultConfId){
                 this.faultConfId=itemData.faultConfId;
             }

@@ -6,7 +6,7 @@ export default {
     data () {
         return {
             titleName:'拨测分析配置',
-            // applicationMonitorVisible: true,
+            // dialtestMonitorVisible: true,
             columns:[
 
                 {
@@ -97,6 +97,10 @@ export default {
         //添加拨测分析
         let addRes=(row,index)=>{
             // row.targetId=proxy.targetId;
+            if(row.checked){
+                proxy.$global.showMsg('数据已存在，请勿重复添加','warning');
+                return;
+            }
             let dialtestList=row;
             dialtestList.dataScope=120;
             let params={
@@ -255,7 +259,7 @@ export default {
                 faultConfId:proxy.faultConfId,
 
             }
-            proxy.$emit('callbackApp',obj);
+            proxy.$emit('callbackDialtest',obj);
         }
         //清除数据
         let restData=()=>{