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

多项优化

上级 47864015
流水线 #23053 已通过 ,包含阶段
in 1 minute 和 4 second
.font[data-v-87c07214]{font-weight:700}
\ No newline at end of file
.font[data-v-4c2eb4e5]{font-weight:700}
\ 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.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
此差异已折叠。
此差异已折叠。
......@@ -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
})
......
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或