Skip to content

F
founder_vue
Commit ee6861f6 by zhangzhijie
Options

西藏改动同步至海南

parent 5576a87f
Showing with 304 additions and 154 deletions
src/views/rwddzx/ddrz/index.vue
......@@ -9,20 +9,19 @@
<template>
<div class="Content">
<right-content
ref="rightContent"
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData"
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:tableData1="tableData"
@add="add"
@dele="dele"
@toZxbz="toZxbz"
@toDdbz="toDdbz"
@toZxrz="toZxrz"
@edit="edit"
cxUrl="/wjcyxgkzx/getMxjclfwrzsjList"
ref="rightContent"
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData"
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:tableData1="tableData"
@add="add"
@dele="dele"
@toZxbz="toZxbz"
@toDdbz="toDdbz"
@toZxrz="toZxrz"
@edit="edit"
></right-content>
</div>
</template>
......@@ -49,73 +48,67 @@ export default {
},
cxQueryField: [
{
name: "任务id",
id: "rwid",
type: "text",
name: "执行器",
id: "zxq",
type: "select",
value: "",
selectData: [
{
name: "生成数据执行器",
value: "1",
},
{
name: "生成数据执行器",
value: "2",
},
],
placeholder: "请选择",
col: "3",
},
{
name: "调度时间",
id: "ddsjStart",
id2: "ddsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "调度结果",
id: "ddjg",
name: "任务",
id: "rw",
type: "select",
value: "",
selectData: [
{
name: '全部',
value: ''
},
{
name: "成功",
name: "全部",
value: "1",
},
{
name: "失败",
value: "0",
name: "生成数据执行器",
value: "2",
},
],
placeholder: "请选择",
col: "3",
},
{
name: "执行时间",
id: "zxsjStart",
id2: "zxsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "执行结果",
id: "zxjg",
name: "状态",
id: "status",
type: "select",
value: "",
selectData: [
{
name: '全部',
value: ''
},
{
name: "成功",
name: "全部",
value: "1",
},
{
name: "失败",
value: "0",
name: "生成数据执行器",
value: "2",
},
],
placeholder: "请选择",
col: "3",
},
{
name: "调度时间",
id: "ddStart",
id2: "ddEnd",
type: "zdyDate",
value: "",
col: "3",
},
],
cxDefaultFormThead: [
{
......@@ -159,7 +152,99 @@ export default {
disabled: false,
},
],
tableData: [],
tableData: [
{
rwid: "0",
ddsj: "2021-12-5 15:10:25",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-12-5 15:10:25",
zxjg: "1",
zxbz: "调度成功",
},
{
rwid: "1",
ddsj: "2021-12-2 10:30:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-12-2 10:30:20",
zxjg: "1",
zxbz: "调度成功",
},
{
rwid: "2",
ddsj: "2021-11-30 11:29:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-11-30 11:29:20",
zxjg: "1",
zxbz: "",
},
{
rwid: "3",
ddsj: "2021-11-28 17:40:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-11-28 17:40:20",
zxjg: "1",
zxbz: "调度成功",
},
{
rwid: "4",
ddsj: "2021-11-25 10:30:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-11-25 10:30:20",
zxjg: "1",
zxbz: "",
},
{
rwid: "5",
ddsj: "2021-11-25 10:30:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-11-25 10:30:20",
zxjg: "1",
zxbz: "调度成功",
},
{
rwid: "6",
ddsj: "2021-11-23 17:29:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-11-23 17:29:20",
zxjg: "1",
zxbz: "调度成功",
},
{
rwid: "7",
ddsj: "2021-11-20 17:29:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-11-20 17:29:20",
zxjg: "1",
zxbz: "调度成功",
},
{
rwid: "8",
ddsj: "2021-11-12 14:29:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-11-12 14:29:20",
zxjg: "1",
zxbz: "调度成功",
},
{
rwid: "9",
ddsj: "2021-11-11 14:29:20",
ddjg: "1",
ddbz: "调度成功",
zxsj: "2021-11-11 14:29:20",
zxjg: "1",
zxbz: "调度成功",
},
],
};
},
created() {
......@@ -172,25 +257,25 @@ export default {
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deleteZdxsxx({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
type: "success",
message: "删除成功",
});
this.$refs.rightContent.doQuery("yes");
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
.then(() => {
deleteZdxsxx({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
type: "success",
message: "删除成功",
});
this.$refs.rightContent.doQuery("yes");
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
});
console.log(scope.row.xxzjbh);
},
//调度结果查看
......@@ -240,7 +325,7 @@ export default {
};
for (var i = 0; i < Object.keys(obj).length; i++) {
domStr += `<div style='text-align:left;'>${
obj[Object.keys(obj)[i]]
obj[Object.keys(obj)[i]]
}</div>`;
}
this.$alert(domStr, "执行日志", {
......
src/views/rwddzx/rwgl/editRwglrwxx.vue
......@@ -9,10 +9,10 @@
<template>
<div>
<form-compontent
:formField="propFormField"
:formLabelAligns="formLabelAlign"
@submit="submit"
:propTitle="title"
:formField="propFormField"
:formLabelAligns="formLabelAlign"
@submit="submit"
:propTitle="title"
>
</form-compontent>
</div>
......@@ -20,7 +20,6 @@
<script>
import formCompontent from "../components/form.vue";
import { getMxjclddByRwid, updateMxjcldd } from '@/api/rwgl'
export default {
name: "editRwglrwxx",
components: {
......@@ -38,6 +37,24 @@ export default {
index: 0,
data: [
{
name: "执行器:",
id: "zxq",
type: "setValue",
codeOptions: [
{
label:'生成数据执行器',
value:'1'
},
{
label:'生成字典执行器',
value:'2'
},
],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "任务描述:",
id: "rwms",
type: "text",
......@@ -47,6 +64,25 @@ export default {
col: "2",
},
{
name: "路由策略:",
id: "lycl",
type: "setValue",
codeTree: "",
codeOptions: [
{
label:'轮询',
value:'01'
},
{
label:'生成字典执行器',
value:'02'
},
],
value: "",
placeholder: "请选择",
col: "2",
},
{
name: "Cron:",
id: "cron",
type: "text",
......@@ -58,15 +94,62 @@ export default {
{
name: "运行模式:",
id: "yxms",
type: "text",
type: "setValue",
codeTree: "",
codeOptions: [
{
label:'BEAN',
value:'01'
},
{
label:'生成字典执行器',
value:'02'
},
],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "JobHanlder:",
id: "jobHlander",
id: "jobhanlder",
type: "text",
value: "",
prop: "checkEmpty",
placeholder: "请输入",
col: "2",
},
{
name: "阻塞处理策略:",
id: "zscl",
type: "setValue",
codeTree: "",
codeOptions: [
{
label:'丢弃后续调度',
value:'01'
},
{
label:'生成字典执行器',
value:'02'
},
],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "子任务ID:",
id: "zrw",
type: "text",
value: "",
prop: "checkEmpty",
placeholder: "请输入",
col: "2",
},
{
name: "任务超时时间:",
id: "rwcssj",
type: "text",
value: "",
prop: "checkEmpty",
......@@ -112,7 +195,21 @@ export default {
],
},
],
formLabelAlign: {},
formLabelAlign: {
zxq:'1',
rwms:"122121",
lycl:'01',
yxms:'01',
cron:'0/01?*****',
jobhanlder:'jobhanlder',
zscl:'01',
zrw:'1',
rwcssj:'2021-12-22 20:4:01',
sbcscs:'12',
fzr:'admin',
cjyj:"1hfhjb@kf.cn",
rwcs:'1884y5bfha'
},
stepList: [
{
title: "基本信息",
......@@ -141,44 +238,7 @@ export default {
glxxzjbh: "",
};
},
created() {
this.$store.commit("user/SET_Breadcrumb", this.Menu);
// if (this.$route.query.glxxzjbh) {
// this.glxxzjbh = this.$route.query.glxxzjbh;
// }
// if (this.$route.query.xxzjbh) {
// this.title = "修改阵地从业人员信息";
// this.xxzjbh = this.$route.query.xxzjbh;
// // this.getshuju();
// }
// this.getInit()
},
mounted() {
this.getInit()
},
methods: {
async getInit() {
const res = await this.getObj()
console.log(res)
this.formLabelAlign = res
},
getObj() {
return new Promise((resolve, reject) => {
getMxjclddByRwid({
rwid: this.$route.query.rwid
}).then(res => {
if (res.success) {
resolve(res.data.mxjcldd);
} else {
reject(res.data)
}
}).catch(err => {
console.log(err)
reject(err)
})
})
},
submit(params) {
console.log(params);
let loading = this.$loading({
......@@ -187,49 +247,43 @@ export default {
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
if (!this.$route.query.rwid) {
if (!this.xxzjbh) {
this.addSubmit(params, loading);
} else {
this.editSubmit(params, loading);
}
},
addSubmit(params, loading) {
console.log('添加',params)
params.append("glzdxxzjbh", this.glxxzjbh);
// getMxjclddByRwid(params).then((res) => {
// if (res.success && res.code == 200) {
// this.$alert("保存成功!", "提示", {
// confirmButtonText: "确定",
// type: "success",
// callback: () => {
// this.$router.push("/queryZdcyryxx");
// loading.close();
// sessionStorage.setItem("routerPath", "queryZdcyryxx");
// setTimeout(() => {
// this.$bus.$emit("routerPath");
// }, 20);
// },
// });
// } else {
// loading.close();
// }
// });
insertZdcyryxx(params).then((res) => {
if (res.success && res.code == 200) {
this.$alert("保存成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
this.$router.push("/queryZdcyryxx");
loading.close();
sessionStorage.setItem("routerPath", "queryZdcyryxx");
setTimeout(() => {
this.$bus.$emit("routerPath");
}, 20);
},
});
} else {
loading.close();
}
});
},
editSubmit(params, loading) {
// console.log(params, loading,'545454')
params.append("rwid", this.$route.query.rwid);
// console.log('params',params)
updateMxjcldd(params).then((res) => {
params.append("xxzjbh", this.xxzjbh);
updateZdcyryxx(params).then((res) => {
if (res.success && res.code == 200) {
this.$alert("修改成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
// this.$router.push("/rwgl");
// loading.close();
window.opener.location.reload()
window.open('','_self');
window.close();
this.$router.push("/queryZdcyryxx");
loading.close();
},
});
} else {
......@@ -274,19 +328,19 @@ export default {
if (result[m.id].length > 0) {
//如果集合有值，则让显示
self.$set(
self.propFormField[iIndex].data[jIndex].childrenAsAdd[
mIndex
],
"flag",
true
self.propFormField[iIndex].data[jIndex].childrenAsAdd[
mIndex
],
"flag",
true
);
}
});
} else {
self.$set(
self.formLabelAlign,
j.id,
i.objStr ? result[i.objStr][j.id] : result[j.id]
self.formLabelAlign,
j.id,
i.objStr ? result[i.objStr][j.id] : result[j.id]
);
}
});
......@@ -298,7 +352,18 @@ export default {
}, 500);
});
},
}
},
created() {
this.$store.commit("user/SET_Breadcrumb", this.Menu);
if (this.$route.query.glxxzjbh) {
this.glxxzjbh = this.$route.query.glxxzjbh;
}
if (this.$route.query.xxzjbh) {
this.title = "修改阵地从业人员信息";
this.xxzjbh = this.$route.query.xxzjbh;
this.getshuju();
}
},
};
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment