Skip to content

F
founder_vue
Commit 8b87b775 by yuhao
Options

Merge branch 'dev_xzeq' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq

parents 47d83b0e 62a92812
Showing with 323 additions and 174 deletions
src/views/ajzcgzxnpg/queryGjzchjwcqk.vue
...@@ -473,7 +473,7 @@ export default { ...@@ -473,7 +473,7 @@ export default {
cursor: pointer; cursor: pointer;
} }
.yuan { .yuan {
width: 20px; //width: 20px;
height: 20px; height: 20px;
background: #ffffff; background: #ffffff;
border-radius: 50%; border-radius: 50%;
......
src/views/mxgl/mxclydy/addMxclydy.vue
...@@ -599,7 +599,7 @@ export default { ...@@ -599,7 +599,7 @@ export default {
box-shadow: none; box-shadow: none;
opacity: 1; opacity: 1;
border-radius: 4px; border-radius: 4px;
:v-deep .el-form-item__content { ::v-deep .el-form-item__content {
display: flex; display: flex;
} }
.del { .del {
......
src/views/mxgl/mxclydy/fzjcgxlfx.vue
...@@ -541,7 +541,7 @@ export default { ...@@ -541,7 +541,7 @@ export default {
.el-rate { .el-rate {
margin-top: 10px; margin-top: 10px;
} }
:v-deep.el-select.el-select--mini { ::v-deep.el-select.el-select--mini {
width: 100px; width: 100px;
} }
#charts { #charts {
......
src/views/mxgl/mxclydy/ywgxlfx.vue
...@@ -541,7 +541,7 @@ export default { ...@@ -541,7 +541,7 @@ export default {
.el-rate { .el-rate {
margin-top: 10px; margin-top: 10px;
} }
:v-deep.el-select.el-select--mini { ::v-deep.el-select.el-select--mini {
width: 100px; width: 100px;
} }
#charts { #charts {
......
src/views/rwddzx/components/ptCxForm_components.vue
...@@ -493,8 +493,8 @@ ...@@ -493,8 +493,8 @@
@click="bqDetail(ajItem, scope.row.zjhm)">{{ @click="bqDetail(ajItem, scope.row.zjhm)">{{
ajItem != "" && ajItem != "" &&
index != scope.row[columnTitle.prop].length - 1 index != scope.row[columnTitle.prop].length - 1
? ajItem ? ajItem
: ajItem : ajItem
}} }}
</el-tag> </el-tag>
</div> </div>
...@@ -508,8 +508,8 @@ ...@@ -508,8 +508,8 @@
:key="index">{{ :key="index">{{
ajItem != "" && ajItem != "" &&
index != scope.row[columnTitle.prop].length - 1 index != scope.row[columnTitle.prop].length - 1
? ajItem ? ajItem
: ajItem : ajItem
}} }}
</el-tag> </el-tag>
</div> </div>
...@@ -523,8 +523,8 @@ ...@@ -523,8 +523,8 @@
:key="index">{{ :key="index">{{
ajItem != "" && ajItem != "" &&
index != scope.row[columnTitle.prop].length - 1 index != scope.row[columnTitle.prop].length - 1
? ajItem ? ajItem
: ajItem : ajItem
}} }}
</el-tag> </el-tag>
</div> </div>
...@@ -566,10 +566,10 @@ ...@@ -566,10 +566,10 @@
<span style="border: 1px solid rgb(64, 158, 255); padding: 0px 4px" <span style="border: 1px solid rgb(64, 158, 255); padding: 0px 4px"
v-if="columnTitle['gradeLev']">{{ v-if="columnTitle['gradeLev']">{{
columnTitle["gradeLev"] == 10 columnTitle["gradeLev"] == 10
? "一般" ? "一般"
: columnTitle["gradeLev"] == 20 : columnTitle["gradeLev"] == 20
? "危险" ? "危险"
: "高危" : "高危"
}}</span> }}</span>
{{ scope.row[columnTitle.prop] }} {{ scope.row[columnTitle.prop] }}
</div> </div>
...@@ -582,21 +582,21 @@ ...@@ -582,21 +582,21 @@
<div v-else-if="columnTitle.prop == 'rzlbdm'"> <div v-else-if="columnTitle.prop == 'rzlbdm'">
{{ {{
scope.row[columnTitle.prop] == "01" scope.row[columnTitle.prop] == "01"
? "证据材料日志" ? "证据材料日志"
: scope.row[columnTitle.prop] == "02" : scope.row[columnTitle.prop] == "02"
? "检查规则日志" ? "检查规则日志"
: "案件证据材料检查日志" : "案件证据材料检查日志"
}} }}
</div> </div>
<div v-else-if="columnTitle.prop == 'czbs'"> <div v-else-if="columnTitle.prop == 'czbs'">
{{ {{
scope.row[columnTitle.prop] == "ADD" scope.row[columnTitle.prop] == "ADD"
? "添加" ? "添加"
: scope.row[columnTitle.prop] == "UPD" : scope.row[columnTitle.prop] == "UPD"
? "修改" ? "修改"
: scope.row[columnTitle.prop] == "DEL" : scope.row[columnTitle.prop] == "DEL"
? "删除" ? "删除"
: "查询" : "查询"
}} }}
</div> </div>
<div v-else-if="columnTitle.prop == 'sfcb'"> <div v-else-if="columnTitle.prop == 'sfcb'">
...@@ -748,7 +748,7 @@ export default { ...@@ -748,7 +748,7 @@ export default {
}, },
/* /*
* pageBs 当前页面的路由名称 * pageBs 当前页面的路由名称
cxQueryField 当前页面的查询条件 cxQueryField 当前页面的查询条件
cxDefaultFormThead 表头 cxDefaultFormThead 表头
*/ */
props: { props: {
......
src/views/rwddzx/ddrz/index.vue
...@@ -9,20 +9,19 @@ ...@@ -9,20 +9,19 @@
<template> <template>
<div class="Content"> <div class="Content">
<right-content <right-content
ref="rightContent" ref="rightContent"
:pageBs="pageBs" :pageBs="pageBs"
:header="header" :header="header"
:cxFormData="cxFormData" :cxFormData="cxFormData"
:cxQueryField="cxQueryField" :cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead" :cxDefaultFormThead="cxDefaultFormThead"
:tableData1="tableData" :tableData1="tableData"
@add="add" @add="add"
@dele="dele" @dele="dele"
@toZxbz="toZxbz" @toZxbz="toZxbz"
@toDdbz="toDdbz" @toDdbz="toDdbz"
@toZxrz="toZxrz" @toZxrz="toZxrz"
@edit="edit" @edit="edit"
cxUrl="/wjcyxgkzx/getMxjclfwrzsjList"
></right-content> ></right-content>
</div> </div>
</template> </template>
...@@ -49,73 +48,67 @@ export default { ...@@ -49,73 +48,67 @@ export default {
}, },
cxQueryField: [ cxQueryField: [
{ {
name: "任务id", name: "执行器",
id: "rwid", id: "zxq",
type: "text", type: "select",
value: "", value: "",
selectData: [
{
name: "生成数据执行器",
value: "1",
},
{
name: "生成数据执行器",
value: "2",
},
],
placeholder: "请选择", placeholder: "请选择",
col: "3", col: "3",
}, },
{ {
name: "调度时间", name: "任务",
id: "ddsjStart", id: "rw",
id2: "ddsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "调度结果",
id: "ddjg",
type: "select", type: "select",
value: "", value: "",
selectData: [ selectData: [
{ {
name: '全部', name: "全部",
value: ''
},
{
name: "成功",
value: "1", value: "1",
}, },
{ {
name: "失败", name: "生成数据执行器",
value: "0", value: "2",
}, },
], ],
placeholder: "请选择", placeholder: "请选择",
col: "3", col: "3",
}, },
{ {
name: "执行时间", name: "状态",
id: "zxsjStart", id: "status",
id2: "zxsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "执行结果",
id: "zxjg",
type: "select", type: "select",
value: "", value: "",
selectData: [ selectData: [
{ {
name: '全部', name: "全部",
value: ''
},
{
name: "成功",
value: "1", value: "1",
}, },
{ {
name: "失败", name: "生成数据执行器",
value: "0", value: "2",
}, },
], ],
placeholder: "请选择", placeholder: "请选择",
col: "3", col: "3",
}, },
{
name: "调度时间",
id: "ddStart",
id2: "ddEnd",
type: "zdyDate",
value: "",
col: "3",
},
], ],
cxDefaultFormThead: [ cxDefaultFormThead: [
{ {
...@@ -159,7 +152,99 @@ export default { ...@@ -159,7 +152,99 @@ export default {
disabled: false, 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() { created() {
...@@ -172,25 +257,25 @@ export default { ...@@ -172,25 +257,25 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
deleteZdxsxx({ deleteZdxsxx({
xxzjbh: scope.row.xxzjbh, xxzjbh: scope.row.xxzjbh,
}).then((res) => { }).then((res) => {
if (res.success && res.code == 200) { if (res.success && res.code == 200) {
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功", message: "删除成功",
}); });
this.$refs.rightContent.doQuery("yes"); this.$refs.rightContent.doQuery("yes");
} }
}); });
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
type: "info", type: "info",
message: "已取消删除", message: "已取消删除",
});
}); });
});
console.log(scope.row.xxzjbh); console.log(scope.row.xxzjbh);
}, },
//调度结果查看 //调度结果查看
...@@ -240,7 +325,7 @@ export default { ...@@ -240,7 +325,7 @@ export default {
}; };
for (var i = 0; i < Object.keys(obj).length; i++) { for (var i = 0; i < Object.keys(obj).length; i++) {
domStr += `<div style='text-align:left;'>${ domStr += `<div style='text-align:left;'>${
obj[Object.keys(obj)[i]] obj[Object.keys(obj)[i]]
}</div>`; }</div>`;
} }
this.$alert(domStr, "执行日志", { this.$alert(domStr, "执行日志", {
......
src/views/rwddzx/rwgl/editRwglrwxx.vue
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
<template> <template>
<div> <div>
<form-compontent <form-compontent
:formField="propFormField" :formField="propFormField"
:formLabelAligns="formLabelAlign" :formLabelAligns="formLabelAlign"
@submit="submit" @submit="submit"
:propTitle="title" :propTitle="title"
> >
</form-compontent> </form-compontent>
</div> </div>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script> <script>
import formCompontent from "../components/form.vue"; import formCompontent from "../components/form.vue";
import { getMxjclddByRwid, updateMxjcldd } from '@/api/rwgl' import {getMxjclddByRwid, updateMxjcldd} from "@/api/rwgl";
export default { export default {
name: "editRwglrwxx", name: "editRwglrwxx",
components: { components: {
...@@ -38,6 +38,24 @@ export default { ...@@ -38,6 +38,24 @@ export default {
index: 0, index: 0,
data: [ data: [
{ {
name: "执行器:",
id: "zxq",
type: "setValue",
codeOptions: [
{
label:'生成数据执行器',
value:'1'
},
{
label:'生成字典执行器',
value:'2'
},
],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "任务描述:", name: "任务描述:",
id: "rwms", id: "rwms",
type: "text", type: "text",
...@@ -47,6 +65,25 @@ export default { ...@@ -47,6 +65,25 @@ export default {
col: "2", col: "2",
}, },
{ {
name: "路由策略:",
id: "lycl",
type: "setValue",
codeTree: "",
codeOptions: [
{
label:'轮询',
value:'01'
},
{
label:'生成字典执行器',
value:'02'
},
],
value: "",
placeholder: "请选择",
col: "2",
},
{
name: "Cron:", name: "Cron:",
id: "cron", id: "cron",
type: "text", type: "text",
...@@ -58,15 +95,62 @@ export default { ...@@ -58,15 +95,62 @@ export default {
{ {
name: "运行模式:", name: "运行模式:",
id: "yxms", id: "yxms",
type: "text", type: "setValue",
codeTree: "", codeTree: "",
codeOptions: [
{
label:'BEAN',
value:'01'
},
{
label:'生成字典执行器',
value:'02'
},
],
value: "", value: "",
placeholder: "请输入", placeholder: "请输入",
col: "2", col: "2",
}, },
{ {
name: "JobHanlder:", 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", type: "text",
value: "", value: "",
prop: "checkEmpty", prop: "checkEmpty",
...@@ -112,7 +196,21 @@ export default { ...@@ -112,7 +196,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: [ stepList: [
{ {
title: "基本信息", title: "基本信息",
...@@ -141,44 +239,7 @@ export default { ...@@ -141,44 +239,7 @@ export default {
glxxzjbh: "", 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: { 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) { submit(params) {
console.log(params); console.log(params);
let loading = this.$loading({ let loading = this.$loading({
...@@ -187,38 +248,30 @@ export default { ...@@ -187,38 +248,30 @@ export default {
spinner: "el-icon-loading", spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)", background: "rgba(255, 255, 255, 0.7)",
}); });
if (!this.$route.query.rwid) { if (!this.xxzjbh) {
this.addSubmit(params, loading); this.addSubmit(params, loading);
} else { } else {
this.editSubmit(params, loading); this.editSubmit(params, loading);
} }
}, },
addSubmit(params, loading) { addSubmit(params, loading) {
console.log('添加',params)
params.append("glzdxxzjbh", this.glxxzjbh); params.append("glzdxxzjbh", this.glxxzjbh);
// getMxjclddByRwid(params).then((res) => { getMxjclddByRwid(params).then((res) => {
// if (res.success && res.code == 200) { if (res.success && res.code == 200) {
// this.$alert("保存成功!", "提示", { this.$alert("保存成功!", "提示", {
// confirmButtonText: "确定", confirmButtonText: "确定",
// type: "success", type: "success",
// callback: () => { callback: () => {
// this.$router.push("/queryZdcyryxx"); window.close()
// loading.close(); },
// sessionStorage.setItem("routerPath", "queryZdcyryxx"); });
// setTimeout(() => { } else {
// this.$bus.$emit("routerPath"); loading.close();
// }, 20); }
// }, });
// });
// } else {
// loading.close();
// }
// });
}, },
editSubmit(params, loading) { editSubmit(params, loading) {
// console.log(params, loading,'545454') params.append("xxzjbh", this.xxzjbh);
params.append("rwid", this.$route.query.rwid);
// console.log('params',params)
updateMxjcldd(params).then((res) => { updateMxjcldd(params).then((res) => {
if (res.success && res.code == 200) { if (res.success && res.code == 200) {
this.$alert("修改成功!", "提示", { this.$alert("修改成功!", "提示", {
...@@ -274,19 +327,19 @@ export default { ...@@ -274,19 +327,19 @@ export default {
if (result[m.id].length > 0) { if (result[m.id].length > 0) {
//如果集合有值，则让显示 //如果集合有值，则让显示
self.$set( self.$set(
self.propFormField[iIndex].data[jIndex].childrenAsAdd[ self.propFormField[iIndex].data[jIndex].childrenAsAdd[
mIndex mIndex
], ],
"flag", "flag",
true true
); );
} }
}); });
} else { } else {
self.$set( self.$set(
self.formLabelAlign, self.formLabelAlign,
j.id, j.id,
i.objStr ? result[i.objStr][j.id] : result[j.id] i.objStr ? result[i.objStr][j.id] : result[j.id]
); );
} }
}); });
...@@ -298,7 +351,18 @@ export default { ...@@ -298,7 +351,18 @@ export default {
}, 500); }, 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> </script>
......
src/views/rwddzx/rwgl/index.vue
...@@ -425,7 +425,7 @@ export default { ...@@ -425,7 +425,7 @@ export default {
}, },
//启动 //启动
run (data) { run (data) {
debugger; console.log(11111)
var self = this; var self = this;
if (data.row.status == "1") { if (data.row.status == "1") {
this.$alert("该任务调度正在运行中，是否需要停止!", "提示", { this.$alert("该任务调度正在运行中，是否需要停止!", "提示", {
......
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