Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
founder_vue
Commits
8b87b775
Commit
8b87b775
authored
Oct 31, 2023
by
yuhao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_xzeq' of
http://39.99.224.27:9022/changchao/founder_vue
into dev_xzeq
parents
47d83b0e
62a92812
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
323 additions
and
174 deletions
+323
-174
src/views/ajzcgzxnpg/queryGjzchjwcqk.vue
+1
-1
src/views/mxgl/mxclydy/addMxclydy.vue
+1
-1
src/views/mxgl/mxclydy/fzjcgxlfx.vue
+1
-1
src/views/mxgl/mxclydy/ywgxlfx.vue
+1
-1
src/views/rwddzx/components/ptCxForm_components.vue
+21
-21
src/views/rwddzx/ddrz/index.vue
+156
-71
src/views/rwddzx/rwgl/editRwglrwxx.vue
+141
-77
src/views/rwddzx/rwgl/index.vue
+1
-1
No files found.
src/views/ajzcgzxnpg/queryGjzchjwcqk.vue
View file @
8b87b775
...
...
@@ -473,7 +473,7 @@ export default {
cursor
:
pointer
;
}
.yuan
{
width
:
20px
;
//
width
:
20px
;
height
:
20px
;
background
:
#ffffff
;
border-radius
:
50%
;
...
...
src/views/mxgl/mxclydy/addMxclydy.vue
View file @
8b87b775
...
...
@@ -599,7 +599,7 @@ export default {
box-shadow
:
none
;
opacity
:
1
;
border-radius
:
4px
;
:v-deep
.el-form-item__content
{
:
:
v-deep
.el-form-item__content
{
display
:
flex
;
}
.del
{
...
...
src/views/mxgl/mxclydy/fzjcgxlfx.vue
View file @
8b87b775
...
...
@@ -541,7 +541,7 @@ export default {
.el-rate
{
margin-top
:
10px
;
}
:v-deep
.el-select.el-select--mini
{
:
:
v-deep
.el-select.el-select--mini
{
width
:
100px
;
}
#charts
{
...
...
src/views/mxgl/mxclydy/ywgxlfx.vue
View file @
8b87b775
...
...
@@ -541,7 +541,7 @@ export default {
.el-rate
{
margin-top
:
10px
;
}
:v-deep
.el-select.el-select--mini
{
:
:
v-deep
.el-select.el-select--mini
{
width
:
100px
;
}
#charts
{
...
...
src/views/rwddzx/components/ptCxForm_components.vue
View file @
8b87b775
...
...
@@ -493,8 +493,8 @@
@
click=
"bqDetail(ajItem, scope.row.zjhm)"
>
{{
ajItem
!=
""
&&
index
!=
scope
.
row
[
columnTitle
.
prop
].
length
-
1
?
ajItem
:
ajItem
?
ajItem
:
ajItem
}}
</el-tag>
</div>
...
...
@@ -508,8 +508,8 @@
:key=
"index"
>
{{
ajItem
!=
""
&&
index
!=
scope
.
row
[
columnTitle
.
prop
].
length
-
1
?
ajItem
:
ajItem
?
ajItem
:
ajItem
}}
</el-tag>
</div>
...
...
@@ -523,8 +523,8 @@
:key=
"index"
>
{{
ajItem
!=
""
&&
index
!=
scope
.
row
[
columnTitle
.
prop
].
length
-
1
?
ajItem
:
ajItem
?
ajItem
:
ajItem
}}
</el-tag>
</div>
...
...
@@ -566,10 +566,10 @@
<span
style=
"border: 1px solid rgb(64, 158, 255); padding: 0px 4px"
v-if=
"columnTitle['gradeLev']"
>
{{
columnTitle
[
"gradeLev"
]
==
10
?
"一般"
:
columnTitle
[
"gradeLev"
]
==
20
?
"危险"
:
"高危"
?
"一般"
:
columnTitle
[
"gradeLev"
]
==
20
?
"危险"
:
"高危"
}}
</span>
{{
scope
.
row
[
columnTitle
.
prop
]
}}
</div>
...
...
@@ -582,21 +582,21 @@
<div
v-else-if=
"columnTitle.prop == 'rzlbdm'"
>
{{
scope
.
row
[
columnTitle
.
prop
]
==
"01"
?
"证据材料日志"
:
scope
.
row
[
columnTitle
.
prop
]
==
"02"
?
"检查规则日志"
:
"案件证据材料检查日志"
?
"证据材料日志"
:
scope
.
row
[
columnTitle
.
prop
]
==
"02"
?
"检查规则日志"
:
"案件证据材料检查日志"
}}
</div>
<div
v-else-if=
"columnTitle.prop == 'czbs'"
>
{{
scope
.
row
[
columnTitle
.
prop
]
==
"ADD"
?
"添加"
:
scope
.
row
[
columnTitle
.
prop
]
==
"UPD"
?
"修改"
:
scope
.
row
[
columnTitle
.
prop
]
==
"DEL"
?
"删除"
:
"查询"
?
"添加"
:
scope
.
row
[
columnTitle
.
prop
]
==
"UPD"
?
"修改"
:
scope
.
row
[
columnTitle
.
prop
]
==
"DEL"
?
"删除"
:
"查询"
}}
</div>
<div
v-else-if=
"columnTitle.prop == 'sfcb'"
>
...
...
@@ -748,7 +748,7 @@ export default {
},
/*
* pageBs 当前页面的路由名称
cxQueryField 当前页面的查询条件
cxQueryField 当前页面的查询条件
cxDefaultFormThead 表头
*/
props
:
{
...
...
src/views/rwddzx/ddrz/index.vue
View file @
8b87b775
...
...
@@ -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
:
"
tex
t"
,
name
:
"
执行器
"
,
id
:
"
zxq
"
,
type
:
"
selec
t"
,
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
View file @
8b87b775
...
...
@@ -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,7 @@
<
script
>
import
formCompontent
from
"../components/form.vue"
;
import
{
getMxjclddByRwid
,
updateMxjcldd
}
from
'@/api/rwgl'
import
{
getMxjclddByRwid
,
updateMxjcldd
}
from
"@/api/rwgl"
;
export
default
{
name
:
"editRwglrwxx"
,
components
:
{
...
...
@@ -38,6 +38,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 +65,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 +95,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 +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
:
[
{
title
:
"基本信息"
,
...
...
@@ -141,44 +239,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,38 +248,30 @@ 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();
// }
// });
getMxjclddByRwid
(
params
).
then
((
res
)
=>
{
if
(
res
.
success
&&
res
.
code
==
200
)
{
this
.
$alert
(
"保存成功!"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
type
:
"success"
,
callback
:
()
=>
{
window
.
close
()
},
});
}
else
{
loading
.
close
();
}
});
},
editSubmit
(
params
,
loading
)
{
// console.log(params, loading,'545454')
params
.
append
(
"rwid"
,
this
.
$route
.
query
.
rwid
);
// console.log('params',params)
params
.
append
(
"xxzjbh"
,
this
.
xxzjbh
);
updateMxjcldd
(
params
).
then
((
res
)
=>
{
if
(
res
.
success
&&
res
.
code
==
200
)
{
this
.
$alert
(
"修改成功!"
,
"提示"
,
{
...
...
@@ -274,19 +327,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 +351,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
>
...
...
src/views/rwddzx/rwgl/index.vue
View file @
8b87b775
...
...
@@ -425,7 +425,7 @@ export default {
},
//启动
run
(
data
)
{
debugger
;
console
.
log
(
11111
)
var
self
=
this
;
if
(
data
.
row
.
status
==
"1"
)
{
this
.
$alert
(
"该任务调度正在运行中,是否需要停止!"
,
"提示"
,
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment