Merge pull request '更新' (#3) from xinwei into master
Reviewed-on: http://120.46.37.243:3000/lundu/ludu-admin-vue3/pulls/3
This commit is contained in:
commit
602b8d3bf0
@ -8,7 +8,7 @@ export interface JobVO {
|
|||||||
handlerParam: string
|
handlerParam: string
|
||||||
cronExpression: string
|
cronExpression: string
|
||||||
retryCount: number
|
retryCount: number
|
||||||
retryInterval: number
|
// retryInterval: number
|
||||||
monitorTimeout: number
|
monitorTimeout: number
|
||||||
createTime: Date
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
@ -20,10 +20,10 @@
|
|||||||
tag="div"
|
tag="div"
|
||||||
>
|
>
|
||||||
<img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
|
<img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
|
||||||
<div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div>
|
<div key="2" class="text-3xl text-white" style="text-align: center;">{{ t('login.welcome') }}</div>
|
||||||
<div key="3" class="mt-5 text-14px font-normal text-white">
|
<!-- <div key="3" class="mt-5 text-14px font-normal text-white">
|
||||||
{{ t('login.message') }}
|
{{ t('login.message') }}
|
||||||
</div>
|
</div> -->
|
||||||
</TransitionGroup>
|
</TransitionGroup>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -49,13 +49,13 @@
|
|||||||
<!-- 账号登录 -->
|
<!-- 账号登录 -->
|
||||||
<LoginForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
|
<LoginForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
|
||||||
<!-- 手机登录 -->
|
<!-- 手机登录 -->
|
||||||
<MobileForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
|
<!-- <MobileForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> -->
|
||||||
<!-- 二维码登录 -->
|
<!-- 二维码登录 -->
|
||||||
<QrCodeForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
|
<!-- <QrCodeForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> -->
|
||||||
<!-- 注册 -->
|
<!-- 注册 -->
|
||||||
<RegisterForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
|
<!-- <RegisterForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> -->
|
||||||
<!-- 三方登录 -->
|
<!-- 三方登录 -->
|
||||||
<SSOLoginVue class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
|
<!-- <SSOLoginVue class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> -->
|
||||||
</div>
|
</div>
|
||||||
</Transition>
|
</Transition>
|
||||||
</div>
|
</div>
|
||||||
|
@ -82,7 +82,7 @@
|
|||||||
mode="pop"
|
mode="pop"
|
||||||
@success="handleLogin"
|
@success="handleLogin"
|
||||||
/>
|
/>
|
||||||
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
|
<!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-row :gutter="5" justify="space-between" style="width: 100%">
|
<el-row :gutter="5" justify="space-between" style="width: 100%">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
@ -139,7 +139,7 @@
|
|||||||
</el-link>
|
</el-link>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col> -->
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
</template>
|
</template>
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
<el-descriptions-item label="重试次数">
|
<el-descriptions-item label="重试次数">
|
||||||
{{ detailData.retryCount }}
|
{{ detailData.retryCount }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="重试间隔">
|
<!-- <el-descriptions-item label="重试间隔">
|
||||||
{{ detailData.retryInterval + ' 毫秒' }}
|
{{ detailData.retryInterval + ' 毫秒' }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item> -->
|
||||||
<el-descriptions-item label="监控超时时间">
|
<el-descriptions-item label="监控超时时间">
|
||||||
{{ detailData.monitorTimeout > 0 ? detailData.monitorTimeout + ' 毫秒' : '未开启' }}
|
{{ detailData.monitorTimeout > 0 ? detailData.monitorTimeout + ' 毫秒' : '未开启' }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
|
@ -29,12 +29,12 @@
|
|||||||
placeholder="请输入重试次数。设置为 0 时,不进行重试"
|
placeholder="请输入重试次数。设置为 0 时,不进行重试"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="重试间隔" prop="retryInterval">
|
<!-- <el-form-item label="重试间隔" prop="retryInterval">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.retryInterval"
|
v-model="formData.retryInterval"
|
||||||
placeholder="请输入重试间隔,单位:毫秒。设置为 0 时,无需间隔"
|
placeholder="请输入重试间隔,单位:毫秒。设置为 0 时,无需间隔"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="监控超时时间" prop="monitorTimeout">
|
<el-form-item label="监控超时时间" prop="monitorTimeout">
|
||||||
<el-input v-model="formData.monitorTimeout" placeholder="请输入监控超时时间,单位:毫秒" />
|
<el-input v-model="formData.monitorTimeout" placeholder="请输入监控超时时间,单位:毫秒" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -64,15 +64,15 @@ const formData = ref({
|
|||||||
handlerParam: '',
|
handlerParam: '',
|
||||||
cronExpression: '',
|
cronExpression: '',
|
||||||
retryCount: undefined,
|
retryCount: undefined,
|
||||||
retryInterval: undefined,
|
// retryInterval: undefined,
|
||||||
monitorTimeout: undefined
|
monitorTimeout: undefined
|
||||||
})
|
})
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
name: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
|
name: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
|
||||||
handlerName: [{ required: true, message: '处理器的名字不能为空', trigger: 'blur' }],
|
handlerName: [{ required: true, message: '处理器的名字不能为空', trigger: 'blur' }],
|
||||||
cronExpression: [{ required: true, message: 'CRON 表达式不能为空', trigger: 'blur' }],
|
cronExpression: [{ required: true, message: 'CRON 表达式不能为空', trigger: 'blur' }],
|
||||||
retryCount: [{ required: true, message: '重试次数不能为空', trigger: 'blur' }],
|
retryCount: [{ required: true, message: '重试次数不能为空', trigger: 'blur' }]
|
||||||
retryInterval: [{ required: true, message: '重试间隔不能为空', trigger: 'blur' }]
|
// retryInterval: [{ required: true, message: '重试间隔不能为空', trigger: 'blur' }]
|
||||||
})
|
})
|
||||||
const formRef = ref() // 表单 Ref
|
const formRef = ref() // 表单 Ref
|
||||||
|
|
||||||
@ -129,7 +129,7 @@ const resetForm = () => {
|
|||||||
handlerParam: '',
|
handlerParam: '',
|
||||||
cronExpression: '',
|
cronExpression: '',
|
||||||
retryCount: undefined,
|
retryCount: undefined,
|
||||||
retryInterval: undefined,
|
// retryInterval: undefined,
|
||||||
monitorTimeout: undefined
|
monitorTimeout: undefined
|
||||||
}
|
}
|
||||||
formRef.value?.resetFields()
|
formRef.value?.resetFields()
|
||||||
|
Loading…
Reference in New Issue
Block a user