提交 0edffe0e 编写于 作者: 刘英杰's avatar 刘英杰

build v250117 1.0.2

上级 e399b95f
流水线 #35400 已失败 ,包含阶段
in 2 minute
......@@ -5,3 +5,5 @@
- 活动管理实际人数字段更为参加活动人数
- 20240618
- 场地管理新增“场地同步到占座系统功能”
- ### build v250117 1.0.2
- 1.活动管理》新增“流程详情”
\ No newline at end of file
.ivu-form-item[data-v-14beac01]{padding-right:15px}.fileRow[data-v-14beac01]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-14beac01]{color:#ed4014}.fileRow .delIcon[data-v-14beac01]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}.cyrIcon[data-v-1a99c483]{color:#515a6e}.cyrIcon[data-v-1a99c483]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-1a99c483]:active{color:#3f485c}
\ No newline at end of file
.ivu-form-item[data-v-14beac01]{padding-right:15px}.fileRow[data-v-14beac01]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-14beac01]{color:#ed4014}.fileRow .delIcon[data-v-14beac01]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}.cyrIcon[data-v-0fb10d3c]{color:#515a6e}.cyrIcon[data-v-0fb10d3c]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-0fb10d3c]:active{color:#3f485c}
\ 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/app~748942c6.de53c9b8.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~253ae210.0b654776.js></script><script src=js/chunk-vendors~678f84af.ad057430.js></script><script src=js/app~748942c6.cb91412b.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/app~748942c6.de53c9b8.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~253ae210.0b654776.js></script><script src=js/chunk-vendors~678f84af.ad057430.js></script><script src=js/app~748942c6.01e948a1.js></script></body></html>
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -57,6 +57,7 @@ export declare function postApiActivityGetActivityListByAdmin(input?: ActivitySe
activity_name: string;
participant_name: string;
apply_num: number;
flow_url: string;
};
}[];
query: {
......
......@@ -26,4 +26,5 @@ export interface ActivityViewModel {
activity_name?: string;
participant_name?: string;
apply_num?: number;
flow_url?: string;
}
......@@ -33,7 +33,7 @@
</Menu>
<div style="position: absolute ;bottom: 10px;width: 100%;">
<div style="display: flex;width:100%;height: 50px; justify-content: center;align-items: center;">
<span style="font-size: 12px;">build v250117 1.0.1</span>
<span style="font-size: 12px;">build v250117 1.0.2</span>
</div>
</div>
......
......@@ -50,6 +50,7 @@
<a style="margin-left: 8px;" @click="eltStudentDetails(row)">学生评价</a>
<a style="margin-left: 8px;" @click="trkDetails(row)">轨迹</a>
<a style="margin-left: 8px;" @click="rowDetails(row)">详情</a>
<a :style="{'margin-left':'8px','color':row.flow_url ? '#3A96F1' :'#707788' }" @click="rowFlowDetails(row)">流程详情</a>
<!-- <a style="margin-left: 8px;" @click="rowCancel(row)">取消活动</a> -->
<!-- <Button type="info" size="small" @click="rowEdit(row)" style="margin-left: 8px">编辑</Button> -->
<!-- <Poptip confirm transfer title="是否确认删除?" @on-ok="rowDelete(row)">
......@@ -332,6 +333,34 @@
</template>
</Modal>
</Card>
<!--详情-->
<Drawer :styles="{'padding': '0px'}" v-model="flowDetails.show" :draggable="true" closable width="70%">
<template #header>
<h3 style="margin-bottom: 5px">流程详情</h3>
</template>
<div style="width: 100%;height: calc(100% - 64px);display: flex;padding: 15px ">
<iframe :src="flowDetails.url" width="100%" height="100%"></iframe>
</div>
<div
style="
height: 64px;
border-top: 5px solid #328CEF;
display: flex;
justify-content: center;
align-items: center;
width: 100%;
"
>
<Button
@click="flowDetails.show = false"
type="primary"
style="width: 120px; font-size: 16px; border-radius: 4px;"
>
关闭
</Button>
</div>
</Drawer>
</div>
</template>
......@@ -354,6 +383,10 @@ export default {
},
data() {
return {
flowDetails:{
show:false,
url:'',
},
importDuty: {
loading: false,
show: false,
......@@ -438,7 +471,7 @@ export default {
{key: 'is_evaluate', title: '是否评价', align: 'center', minWidth: 150, show: false},
{key: 'flow_id', title: '关联流程id', align: 'center', minWidth: 150, show: false},
{slot: 'participant', title: '参与人', align: 'center', minWidth: 80, show: true, fixed: 'right'},
{slot: 'action', title: '操作', align: 'center', minWidth: 280, show: true, fixed: 'right'},
{slot: 'action', title: '操作', align: 'center', width: 360, show: true, fixed: 'right'},
],
tableLoading: false,
......@@ -846,6 +879,15 @@ export default {
this.editModalLoading = false
})
},
// 流程详情
rowFlowDetails(row) {
if (!row.flow_url) return
this.flowDetails.url = row.flow_url
this.flowDetails.show = true
},
// 编辑
// rowEdit(row){
// console.log('编辑行', row)
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或