Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
Support
提交反馈
为 GitLab 提交贡献
登录
切换导航
C
competitionWeb
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
刘英杰
competitionWeb
提交
c3f8379e
提交
c3f8379e
编写于
12月 15, 2023
作者:
刘英杰
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
多项优化
上级
47864015
流水线
#23053
已通过 ,包含阶段
in 1 minute 和 4 second
变更
9
流水线
1
展开全部
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
61 行增加
和
23 行删除
+61
-23
chunk-54110150.2187d4e2.css
dist/css/chunk-54110150.2187d4e2.css
+1
-0
chunk-c5ccb2e6.8ff35f9c.css
dist/css/chunk-c5ccb2e6.8ff35f9c.css
+0
-1
index.html
dist/index.html
+1
-1
app.2290e401.js
dist/js/app.2290e401.js
+2
-2
chunk-54110150.b00692b7.js
dist/js/chunk-54110150.b00692b7.js
+1
-0
chunk-c5ccb2e6.54afd323.js
dist/js/chunk-c5ccb2e6.54afd323.js
+0
-1
chunk-vendors.1c0021a0.js
dist/js/chunk-vendors.1c0021a0.js
+1
-1
flowDesign.vue
src/pages/systemConfiguration/flowDesign.vue
+54
-17
index.js
src/plugins/request/index.js
+1
-0
未找到文件。
dist/css/chunk-54110150.2187d4e2.css
0 → 100644
浏览文件 @
c3f8379e
.font
[
data-v-87c07214
]
{
font-weight
:
700
}
\ No newline at end of file
dist/css/chunk-c5ccb2e6.8ff35f9c.css
已删除
100644 → 0
浏览文件 @
47864015
.font
[
data-v-4c2eb4e5
]
{
font-weight
:
700
}
\ No newline at end of file
dist/index.html
浏览文件 @
c3f8379e
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
http-equiv=
X-UA-Compatible
content=
"IE=edge"
><meta
name=
viewport
content=
"width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"
><link
rel=
"shortcut icon"
href=
favicon.ico
><title>
竞赛管理
</title><link
href=
css/chunk-vendors.064c214c.css
rel=
stylesheet
><link
href=
css/app.1af866c1.css
rel=
stylesheet
></head><body><script
src=
/a/manager/identify/identify.js
></script><noscript><strong>
请开启 JavaScript 功能来使用 竞赛管理。
</strong></noscript><div
id=
app
></div><script
src=
js/chunk-vendors.37169531.js
></script><script
src=
js/app.d6ef6061.js
></script></body></html>
\ No newline at end of file
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
http-equiv=
X-UA-Compatible
content=
"IE=edge"
><meta
name=
viewport
content=
"width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"
><link
rel=
"shortcut icon"
href=
favicon.ico
><title>
竞赛管理
</title><link
href=
css/chunk-vendors.064c214c.css
rel=
stylesheet
><link
href=
css/app.1af866c1.css
rel=
stylesheet
></head><body><script
src=
/a/manager/identify/identify.js
></script><noscript><strong>
请开启 JavaScript 功能来使用 竞赛管理。
</strong></noscript><div
id=
app
></div><script
src=
js/chunk-vendors.1c0021a0.js
></script><script
src=
js/app.2290e401.js
></script></body></html>
\ No newline at end of file
dist/js/app.
d6ef606
1.js
→
dist/js/app.
2290e40
1.js
浏览文件 @
c3f8379e
此差异已折叠。
点击以展开。
dist/js/chunk-54110150.b00692b7.js
0 → 100644
浏览文件 @
c3f8379e
此差异已折叠。
点击以展开。
dist/js/chunk-c5ccb2e6.54afd323.js
已删除
100644 → 0
浏览文件 @
47864015
此差异已折叠。
点击以展开。
dist/js/chunk-vendors.
37169531
.js
→
dist/js/chunk-vendors.
1c0021a0
.js
浏览文件 @
c3f8379e
此差异已折叠。
点击以展开。
src/pages/systemConfiguration/flowDesign.vue
浏览文件 @
c3f8379e
...
...
@@ -107,7 +107,11 @@
<!-- <Tag :color="['primary','success'][row.process_mode]"> {{ ['或签', '会签'][row.process_mode] }}</Tag>-->
<!-- </template>-->
<
template
#is_switch
="{
row
}"
>
{{
[
'
否
'
,
'
是
'
][
row
.
is_switch
]
}}
<Tag
:color=
"['warning','blue'][row.is_switch === 1 ? 1 : 0]"
>
{{
[
'
否
'
,
'
是
'
][
row
.
is_switch
===
1
?
1
:
0
]
}}
</Tag>
</
template
>
<
template
v-slot:action=
"{row}"
>
<a
@
click=
"nodeInfo(row)"
>
详细
</a>
...
...
@@ -169,6 +173,24 @@
</span>
</Col>
</Row>
<Row>
<Col
:span=
"12"
>
<span>
是否关联院系:
</span>
<span
class=
"font"
>
{{ ['否', '是'][nodeDrewerData.is_switch ? 1 : 0] }}
</span>
</Col>
<Col
:span=
"12"
style=
" display: flex;justify-content: flex-end"
>
<span
v-if=
" Boolean(nodeDrewerData.is_switch)"
>
院系:
</span>
<span
class=
"font"
>
{{ nodeDrewerData.dept }}
</span>
</Col>
</Row>
</Drawer>
</Modal>
...
...
@@ -217,7 +239,7 @@
</
template
>
</Switch>
</FormItem>
<FormItem
v-if=
"formValidate1.is_switch"
label=
院系
<FormItem
v-if=
"formValidate1.is_switch"
label=
"院系"
:prop=
"['dept_id1','dept_id'][Number(formValidate1.is_switch)]"
>
<Select
v-model=
"formValidate1.dept_id"
placeholder=
"请选择院系"
>
<Option
v-for=
"(item,index) in deptArray"
:value=
"item.id"
:key=
"index"
>
{{
...
...
@@ -236,8 +258,12 @@
<!-- </FormItem>-->
</Form>
<
template
#footer
>
<div
style=
"display: flex;justify-content: flex-end"
>
<Button
type=
"text"
@
click=
"addNodeModal =false"
>
取消
</Button>
<Button
type=
"primary"
@
click=
"addNodeOk"
>
确定
</Button>
<!--
<Button
type=
"primary"
@
click=
"addNodeOk"
>
确定
</Button>
-->
<cs-button
ref=
"addNodeOk"
cs-text=
"确定"
:cs-click=
"addNodeOk"
></cs-button>
</div>
</
template
>
</Modal>
...
...
@@ -305,8 +331,11 @@
<!-- </FormItem>-->
</Form>
<
template
#footer
>
<div
style=
"display: flex;justify-content: flex-end"
>
<Button
type=
"text"
@
click=
"addNodeModal1 =false"
>
取消
</Button>
<Button
type=
"primary"
@
click=
"addNodeOk1"
>
确定
</Button>
<!--
<Button
type=
"primary"
@
click=
"addNodeOk1"
>
确定
</Button>
-->
<cs-button
ref=
"addNodeOk1"
cs-text=
"确定"
:cs-click=
"addNodeOk1"
></cs-button>
</div>
</
template
>
</Modal>
</div>
...
...
@@ -593,10 +622,14 @@ export default {
})
},
EditswitchValue
(
e
)
{
this
.
formValidate2
.
is_switch
=
e
this
.
formValidate2
.
dept_id
=
''
},
switchValue
(
e
)
{
this
.
formValidate1
.
is_switch
=
e
this
.
formValidate1
.
dept_id
=
''
console
.
log
(
"
🚀🚀🚀this.formValidate1.is_switch,
"
,
this
.
formValidate1
.
is_switch
)
},
async
GetFlowUserGroupBySelect
()
{
const
res
=
await
api
.
GetFlowUserGroupBySelect
({
key
:
''
})
...
...
@@ -729,15 +762,17 @@ export default {
addNodeOk
()
{
const
empty
=
()
=>
{
this
.
addNodeModal
=
false
let
flow_id
=
this
.
formValidate1
.
flow_id
this
.
formValidate1
=
{}
this
.
formValidate1
.
flow_id
=
flow_id
//
let flow_id = this.formValidate1.flow_id
//
this.formValidate1 = {}
//
this.formValidate1.flow_id = flow_id
}
this
.
$refs
[
'
formValidate1
'
].
validate
(
async
(
va
)
=>
{
if
(
va
)
{
let
data
=
_
.
cloneDeep
({...
this
.
formValidate1
,
is_switch
:
Number
(
this
.
formValidate1
.
is_switch
)})
const
res
=
await
hook
.
myEncapsulationFunction
(
async
()
=>
{
this
.
$refs
.
addNodeOk
.
load
=
true
const
res
=
await
api
.
FlowNodeSave
(
data
)
this
.
$refs
.
addNodeOk
.
load
=
false
await
this
.
fun
(
this
.
formValidate1
.
flow_id
)
return
res
})
...
...
@@ -777,22 +812,24 @@ export default {
this
.
addModal
=
true
},
async
editNode
(
row
)
{
this
.
formValidate2
=
{
}
// this.formValidate2 = {...row, is_switch: Number(row.is_switch)
}
this
.
addNodeModal1
=
true
const
res
=
await
api
.
GetFlowNodeInfo
({
flowid
:
row
.
flow_id
,
nodeid
:
row
.
nodeid
})
this
.
formValidate2
=
res
.
response
//
const res = await api.GetFlowNodeInfo({flowid: row.flow_id, nodeid: row.nodeid})
//
this.formValidate2 = res.response
this
.
formValidate2
=
{...
row
,
is_switch
:
Boolean
(
row
.
is_switch
)}
},
async
addNodeOk1
()
{
const
empty
=
()
=>
{
let
flow_id
=
this
.
formValidate2
.
flow_id
//
let flow_id = this.formValidate2.flow_id
this
.
addNodeModal1
=
false
this
.
formValidate2
=
{}
this
.
formValidate2
.
flow_id
=
flow_id
//
this.formValidate2 = {}
//
this.formValidate2.flow_id = flow_id
}
const
res
=
await
hook
.
myEncapsulationFunction
(
async
()
=>
{
let
data
=
_
.
cloneDeep
(
this
.
formValidate2
)
this
.
$refs
.
addNodeOk1
.
load
=
true
let
data
=
_
.
cloneDeep
({...
this
.
formValidate2
,
is_switch
:
Number
(
this
.
formValidate2
.
is_switch
)})
const
res
=
await
api
.
FlowNodeSave
(
data
)
this
.
$refs
.
addNodeOk1
.
load
=
false
await
this
.
fun
(
this
.
formValidate2
.
flow_id
)
return
res
})
...
...
src/plugins/request/index.js
浏览文件 @
c3f8379e
...
...
@@ -114,6 +114,7 @@ service.interceptors.response.use(
errorCreate
(
`[ code: xxx ]
${
dataAxios
.
msg
}
:
${
response
.
config
.
url
}
`
);
break
;
default
:
// 不是正确的 code
errorCreate
(
`
${
dataAxios
.
msg
}
:
${
response
.
config
.
url
}
`
);
return
dataAxios
;
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录