diff --git a/src/api/disRevenue/resource.js b/src/api/disRevenue/resource.js
index 9ca8167..a35ff5a 100644
--- a/src/api/disRevenue/resource.js
+++ b/src/api/disRevenue/resource.js
@@ -1208,19 +1208,21 @@ export function listMtrPolicy(query) {
})
}
// 新增
-export function addMtrPolicy(data) {
+export function addMtrPolicy(data, config) {
return request({
url: '/mtragent/mtrPolicyConfig',
method: 'post',
- data: data
+ data: data,
+ ...config
})
}
// 修改
-export function updateMtrPolicy(data) {
+export function updateMtrPolicy(data, config) {
return request({
url: '/mtragent/mtrPolicyConfig',
method: 'put',
- data: data
+ data: data,
+ ...config
})
}
// 查询详细
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index edef2ef..fe2b35f 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -399,7 +399,7 @@
}
},
// 提供给父组件调用的方法:默认选中值 otherRow:新的回显方式,防止破坏原来rows判断的逻辑与回显
- defaultSelectRows(rows,otherRow){
+ defaultSelectRowsAll(rows,otherRow){
const tableInstance = this.config && this.config.tableKey ? this.$refs[`tableRef_${this.config.tableKey}`] : this.$refs.selChangeList;
this.selectList = [];
this.ids = [];
diff --git a/src/router/index.js b/src/router/index.js
index 3956d29..b5d29e9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -784,6 +784,20 @@ export const dynamicRoutes = [
}
]
},
+ {
+ path: '/resource/mtrAgent/addMtrProbe',
+ component: Layout,
+ hidden: true,
+ permissions: ['resource:mtrAgent:addMtrProbe'],
+ children: [
+ {
+ path: ':id?',
+ component: () => import('@/views/resource/mtrProbe/mtrProbeView'),
+ name: 'mtrAgentLossRateProbe',
+ meta: { title: '新建MTR探测策略', activeMenu: '/resource/mtrAgent' }
+ }
+ ]
+ },
// mtr探测策略
{
path: '/resource/mtrProbe/view',
diff --git a/src/utils/request.js b/src/utils/request.js
index 06a9aa7..8235d59 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -95,8 +95,11 @@ service.interceptors.response.use(res => {
}
return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
} else if (code === 500) {
- Message({ message: msg, type: 'error' })
- return Promise.reject(new Error(msg))
+ if (!(res.config && res.config.skipErrorHandling)) {
+ Message({ message: msg, type: 'error' })
+ return Promise.reject(new Error(msg))
+ }
+ return Promise.reject(msg)
} else if (code === 601) {
Message({ message: msg, type: 'warning' })
return Promise.reject('error')
diff --git a/src/views/earnManage/busValueCount/details.vue b/src/views/earnManage/busValueCount/details.vue
index 6984ffe..a33b2ff 100644
--- a/src/views/earnManage/busValueCount/details.vue
+++ b/src/views/earnManage/busValueCount/details.vue
@@ -173,7 +173,7 @@
this.tableList = val && val.data || [];
if (this.tableColChange[changeVal] && this.tableColChange[changeVal].length > 0) {
setTimeout(() => {
- this.$refs.tabRef.defaultSelectRows(null, this.tableColChange[changeVal]);
+ this.$refs.tabRef.defaultSelectRowsAll(null, this.tableColChange[changeVal]);
},500);
}
this.$modal.closeLoading();
diff --git a/src/views/earnManage/businessIdent/businessIdent.vue b/src/views/earnManage/businessIdent/businessIdent.vue
index 55f80a1..445cfee 100644
--- a/src/views/earnManage/businessIdent/businessIdent.vue
+++ b/src/views/earnManage/businessIdent/businessIdent.vue
@@ -171,7 +171,7 @@
// });
// this.download("/system/Business/export", {properties: dataList,}, `业务管理_${new Date().getTime()}.xlsx`);
let paramsList = Object.assign({}, this.queryParams,rowData);
- this.download("system/Business/export", paramsList, `业务管理_${new Date().getTime()}.xlsx`, null, 'json');
+ this.download("system/business/export", paramsList, `业务管理_${new Date().getTime()}.xlsx`, null, 'json');
break;
default:
diff --git a/src/views/resource/messagePush/messagePush.vue b/src/views/resource/messagePush/messagePush.vue
index 5c6ff76..1d85778 100644
--- a/src/views/resource/messagePush/messagePush.vue
+++ b/src/views/resource/messagePush/messagePush.vue
@@ -155,7 +155,7 @@
// });
// this.download("/system/alarmManage/export", {properties: dataList,}, `拓扑管理_${new Date().getTime()}.xlsx`);
let paramsList = Object.assign({}, this.queryParams,rowData);
- this.download("system/alarmManage/export", paramsList, `消息推送_${new Date().getTime()}.xlsx`, null, 'json');
+ this.download("rocketmq/alarmPushConfig/export", paramsList, `消息推送_${new Date().getTime()}.xlsx`, null, 'json');
break;
default:
}
diff --git a/src/views/resource/mtrAgent/mtrAgent.vue b/src/views/resource/mtrAgent/mtrAgent.vue
index 59679d6..8295e76 100644
--- a/src/views/resource/mtrAgent/mtrAgent.vue
+++ b/src/views/resource/mtrAgent/mtrAgent.vue
@@ -87,9 +87,9 @@
-
-
-
+
+
+
@@ -238,8 +238,15 @@
});
break;
case 'addMtrProbe':
- this.mtrProbeOpen = true;
- this.dialogRowData = rowData || {};
+ // this.mtrProbeOpen = true;
+ // this.dialogRowData = rowData || {};
+ this.$router.push({
+ path:'/resource/mtrAgent/addMtrProbe',
+ query: {
+ routeType: 'mtrAgent',
+ mtrClientId: rowData.mtrClientId
+ }
+ });
break;
case 'echartView':
this.$router.push({
diff --git a/src/views/resource/mtrProbe/mtrProbeView.vue b/src/views/resource/mtrProbe/mtrProbeView.vue
index eaf9bef..9a4396c 100644
--- a/src/views/resource/mtrProbe/mtrProbeView.vue
+++ b/src/views/resource/mtrProbe/mtrProbeView.vue
@@ -1,6 +1,12 @@
@@ -50,7 +56,10 @@
formList: [],
paramsData: {},
config: {},
- includeList: {}
+ includeList: {},
+ errorMsgOpen: false,
+ errorMsg: '',
+ routeType: '',
}
},
created() {
@@ -62,6 +71,13 @@
this.$set(this.ruleForm, 'clientAllId', false);
}
}
+ // mtrAgent页面跳转过来的值
+ if (this.paramsData && this.paramsData.routeType) {
+ this.routeType = this.paramsData.routeType;
+ this.$set(this.ruleForm, 'mtrClientId', this.paramsData && this.paramsData.mtrClientId || '');
+ this.$set(this.ruleForm, 'clientAllId', false);
+ }
+
if (this.paramsData && this.paramsData.id) {
this.getFormDataList(this.paramsData.id);
} else {
@@ -210,22 +226,27 @@
if (dataVal && dataVal.id) {
fnType = updateMtrPolicy;
}
- fnType(dataVal).then(response => {
+ fnType(dataVal, {skipErrorHandling: true}).then(response => {
this.$modal.msgSuccess(response.msg);
this.loading = false;
if (this.open) {
this.$emit("dialogResult", {open: true});
+ } else if (this.routeType === 'mtrAgent') {
+ this.$router.push("/resource/mtrAgent")
} else {
this.$router.push("/resource/mtrProbe")
}
- }).catch(() => {
+ }).catch((error) => {
+ this.errorMsgOpen = true;
+ this.errorMsg = error.replace(':',':
').replace(/,/g, '
');
this.loading = false;
- this.$modal.msgError("操作失败")
});
break;
case 'cancel':
if (this.open) {
this.$emit("dialogResult", {open: false});
+ } else if (this.routeType === 'mtrAgent') {
+ this.$router.push("/resource/mtrAgent")
} else {
this.$router.push("/resource/mtrProbe")
}
@@ -237,5 +258,8 @@
}
}
-
diff --git a/src/views/resource/serverRegister/index.vue b/src/views/resource/serverRegister/index.vue
index a493906..7a0ff7d 100644
--- a/src/views/resource/serverRegister/index.vue
+++ b/src/views/resource/serverRegister/index.vue
@@ -89,7 +89,7 @@
-
+
{{row.clientId}}
@@ -512,8 +512,8 @@
this.dialogRowData = rowData;
break;
case 'tagRemark':
+ this.tagRuleForm = {};
this.tagOpen = true;
- this.tagRuleForm = {remark: null, deployDevice: ''};
this.$nextTick(() => {
// 5. 最后执行重置
if (this.$refs['tagFormRef']?.$refs.ruleForm) {
@@ -522,11 +522,10 @@
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.$set(this.tagRuleForm, 'id', rowData.id);
+ this.$set(this.tagRuleForm, 'deployDevice', rowData.clientId);
+ this.$set(this.tagRuleForm, 'remark', rowData && rowData.remark ? rowData.remark.split(',') : null);
+ // this.tagRuleForm = this.deepCopy(modelVal);
this.tagFormList[0].controls.deployDevice['disabled'] = true;
} else {
this.tagTitle = '批量增加标签';
@@ -539,10 +538,9 @@
params+= item.clientId + '\n'
}
});
- this.tagRuleForm = {
- deployDevice: params,
- remark: null
- };
+ this.$set(this.tagRuleForm, 'deployDevice', params);
+ this.$set(this.tagRuleForm, 'remark', null);
+ this.$set(this.tagRuleForm, 'id', null);
}
}
});
@@ -718,6 +716,8 @@
fnType(params).then(res => {
this.$modal.msgSuccess(res.msg);
this.tagOpen = false;
+ this.tagRuleForm = {};
+ this.$refs.tabRef.defaultSelectRows([]);
this.getList();
});
},