@@ -35,7 +38,7 @@
{{
row.errorStatus === "1" ? "需要重新发送" : "不需要重新发送"
- }}
+ }}
@@ -83,13 +86,21 @@ export default {
optionValue: "id",
optionLabel: "name",
},
+ {
+ placeholder: "开始日期",
+ prop: "createTimeStart",
+ tag: "elDatePicker",
+ },
+ {
+ placeholder: "结束日期",
+ prop: "createTimeEnd",
+ tag: "elDatePicker",
+ },
{
placeholder: "状态",
prop: "status",
tag: "elSelect",
options: [
- {id: "1", label: "待发送"},
- {id: "2", label: "发送中"},
{id: "3", label: "发送成功"},
{id: "4", label: "发送失败"},
],
@@ -100,6 +111,21 @@ export default {
optionValue: "id",
optionLabel: "label",
},
+ {
+ placeholder: "源数据",
+ prop: "sourceData",
+ tag: "elInput",
+ },
+ {
+ placeholder: "目标数据",
+ prop: "targetData",
+ tag: "elInput",
+ },
+ {
+ placeholder: "返回信息",
+ prop: "returnData",
+ tag: "elInput",
+ },
], //查询模板list
tabLoading: false,
tableColumnData: configData.tableColumnData, //表头数据
@@ -112,7 +138,7 @@ export default {
tableData: [], //表格数据
pageModel: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 100,
},
queryModel: {
theme: "",
@@ -121,29 +147,48 @@ export default {
receiveApp: "",
receiveApi: "",
status: "",
+ targetData: '',
+ sourceData: '',
+ returnData: ''
},
};
},
created() {
- this.GetMessageLogTableData();
+ // this.GetMessageLogTableData();
this.initSelect()
},
methods: {
+ async onElSelect(event, index, indexItem, model, row) {
+ console.log(event, index, indexItem, model, row)
+
+ if (row.placeholder === '接受者应用') {
+ this.$set(this.queryModel, 'receiveApi', '')
+ this.$set(this.$refs.baseLayout.ruleForm, 'receiveApi', "")
+ if (event) {
+ const res = await authApi('sysApplicationService', 'application', 'thirdInterfacequeryAppApi', '', {
+ appId: event
+ })
+ if (res.status == 200) {
+ this.requirementList[2].options = res.attribute
+ }
+ } else {
+ this.requirementList[2].options = []
+ }
+ }
+ },
// 表格数据
async GetMessageLogTableData() {
this.tabLoading = true;
let param = {
...this.pageModel,
...this.queryModel,
- receiveApp: this.$route.query.id,
- receiveApi: this.receiveApi
};
let res = await authApi(
- "sysApplicationService",
- "application",
- "queryAppApiLog",
- "",
- param
+ "sysApplicationService",
+ "application",
+ "thirdInterfacequeryAppApiLog",
+ "",
+ param
);
this.tabLoading = false;
console.log(res, 112312312)
@@ -181,16 +226,16 @@ export default {
cancelButtonText: "取消",
type: "warning",
})
- .then(() => {
- this.openLoading("detail");
- this.messageResendData(row.id);
- })
- .catch(() => {
- this.$message({
- type: "info",
- message: "取消重新发送",
+ .then(() => {
+ this.openLoading("detail");
+ this.messageResendData(row.id);
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "取消重新发送",
+ });
});
- });
}
},
async messageResendData(id) {
@@ -198,11 +243,11 @@ export default {
id: id,
};
let res = await authApi(
- "sysMessageManageLogService",
- "messageManage",
- "resendData",
- "",
- param
+ "sysMessageManageLogService",
+ "messageManage",
+ "resendData",
+ "",
+ param
);
if (res.status == "200") {
this.$vmNews("重新发送成功!", "success");
@@ -218,24 +263,40 @@ export default {
// 搜索
handleSearchEvent(form) {
let data = this.$refs.baseLayout.ruleForm;
- this.queryModel.theme = data.theme;
- this.queryModel.sendApp = data.sendApp;
- this.queryModel.sendApi = data.sendApi;
- this.queryModel.receiveApp = data.receiveApp;
- this.queryModel.receiveApi = data.receiveApi;
- this.queryModel.status = data.status;
+ data.receiveApp = this.$route.query.id;
+ data.receiveApi = this.receiveApi;
+ this.queryModel = {...data}
+ // if (!data.sendApp) {
+ // this.$vmNews("请选择发送者应用")
+ // return
+ // }
+ // if (!data.receiveApp) {
+ // this.$vmNews("请选择接受者应用")
+ // return
+ // }
+ // if (!data.receiveApi) {
+ // this.$vmNews("请选择接受者api")
+ // return
+ // }
+ if (!data.status) {
+ this.$vmNews("请选择状态")
+ return
+ }
+
this.resetTable();
},
async initSelect() {
const res = await getApiModuleApi({
tl: "sysApplicationService",
as: "application",
- dj: "queryApp"
+ dj: "thirdInterfacequeryApp"
}, {
"pageNum": 1,
"pageSize": 999
})
+ console.log(res, 'res')
this.requirementList[0].options = res.attribute.list
+ this.requirementList[1].options = res.attribute.list
},
// async onElSelect(val, b, c, d, row) {
// if (row.prop === 'sendApp') {
@@ -258,9 +319,12 @@ export default {
};
-
diff --git a/src/views/applicationList/apiList/messageManagementLog/rightDialog.vue b/src/views/applicationList/apiList/messageManagementLog/rightDialog.vue
index b0bf4e2..90cbbe5 100644
--- a/src/views/applicationList/apiList/messageManagementLog/rightDialog.vue
+++ b/src/views/applicationList/apiList/messageManagementLog/rightDialog.vue
@@ -1,46 +1,46 @@
@@ -81,7 +81,7 @@ export default {
methods: {
openDialog(type, row) {
this.querysysAppService();
- this.querysysAppApiService();
+ // this.querysysAppApiService();
this.formRow = configData.formRow;
this.submitShow = true;
// 编辑
@@ -106,11 +106,11 @@ export default {
id: id,
};
let res = await authApi(
- "sysMessageManageLogService",
- "messageManage",
- "queryEntity",
- "",
- params
+ "sysMessageManageLogService",
+ "messageManage",
+ "thirdInterfacequeryEntity",
+ "",
+ params
);
if (res.status == "200") {
this.$nextTick(() => {
@@ -184,11 +184,11 @@ export default {
// 编辑保存
async messageLogUpdateDto(params) {
let res = await authApi(
- "sysMessageManageLogService",
- "messageManage",
- "updateEntity",
- "",
- params
+ "sysMessageManageLogService",
+ "messageManage",
+ "updateEntity",
+ "",
+ params
);
if (res.status == "200") {
this.handleDialogClose();
@@ -201,7 +201,7 @@ export default {
const res = await getApiModuleApi({
tl: "sysApplicationService",
as: "application",
- dj: "queryApp"
+ dj: "thirdInterfacequeryApp"
}, {
"pageNum": 1,
"pageSize": 999
@@ -219,11 +219,11 @@ export default {
pageNum: 1,
};
let res = await authApi(
- "appApiService",
- "appApi",
- "queryPage",
- "",
- params
+ "appApiService",
+ "appApi",
+ "queryPage",
+ "",
+ params
);
if (res.status == "200") {
// this.formRow[1].elCol[1].options = res.attribute.list;
@@ -247,7 +247,7 @@ export default {