xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-13 06:03:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.修改quartz问题。2完善数据范围添加策略支持。3修改swaggerbug。4取消验证码

Browse Source
This commit is contained in:
yandanyang
2020-11-28 23:02:08 +08:00
parent 70173ebd22
commit 01fe8a7c16
17 changed files with 263 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
smart-admin-web/src/views/login/components/login-form.vue
View File

@@ -7,10 +7,10 @@
<FormItem prop="loginPwd">
<Input placeholder="请输入密码" type="password" v-model="formData.loginPwd"></Input>
</FormItem>
<FormItem prop="code">
<!-- <FormItem prop="code">
<Input class="code-input" placeholder="请输入验证码" v-model="formData.code"></Input>
<img :src="codeUrl" @click="verificationCode" class="codeUrl" v-if="codeUrl" />
</FormItem>
</FormItem> -->
<FormItem class="remember">
<Checkbox>记住密码</Checkbox>
</FormItem>
@@ -47,14 +47,15 @@ export default {
default: () => {
return [{ required: true, message: '密码不能为空', trigger: 'blur' }];
}
},
// 验证码规则
codedRules: {
type: Array,
default: () => {
return [{ required: true, message: '验证码不能为空', trigger: 'blur' }];
}
}
// ,
// // 验证码规则
// codedRules: {
// type: Array,
// default: () => {
// return [{ required: true, message: '验证码不能为空', trigger: 'blur' }];
// }
// }
},
data() {
return {
@@ -79,7 +80,7 @@ export default {
}
},
mounted() {
this.verificationCode();
// this.verificationCode();
},
methods: {
// 获取验证码
@@ -125,7 +126,7 @@ export default {
//TODO zhuoda sentry
console.error(e);
this.btnLoading = false;
this.verificationCode();
//this.verificationCode();
}
}
}

56
smart-admin-web/src/views/support/task/task-list.vue
View File

@@ -365,6 +365,7 @@ export default {
} catch (e) {
//TODO zhuoda sentry
console.error(e);
} finally {
this.loading = false;
}
},
@@ -400,33 +401,52 @@ export default {
},
// 删除任务
async deleteTask(id) {
let result = await taskApi.deleteTask(id);
this.$Message.success('删除任务成功!');
this.getTaskList();
this.$Spin.show();
try{
let result = await taskApi.deleteTask(id);
this.$Message.success('删除任务成功!');
this.getTaskList();
} catch (error) {
console.error(e);
} finally {
this.$Spin.hide();
}
},
// 操作任务
async controlTask(type, id) {
this.$Spin.show();
switch (type) {
case 'RUN':
await taskApi.updateTaskRun(id);
break;
case 'PAUSE':
await taskApi.updateTaskPause(id);
break;
case 'RESUME':
await taskApi.updateTaskResume(id);
break;
try{
switch (type) {
case 'RUN':
await taskApi.updateTaskRun(id);
break;
case 'PAUSE':
await taskApi.updateTaskPause(id);
break;
case 'RESUME':
await taskApi.updateTaskResume(id);
break;
}
this.$Message.success('操作成功');
this.getTaskList();
} catch (error) {
console.error(e);
} finally {
this.$Spin.hide();
}
this.$Spin.hide();
this.$Message.success('操作成功');
this.getTaskList();
},
// 触发更新
handleUpdate() {
this.$refs['updateRef'].validate(valid => {
if (valid) {
this.updateTask();
this.$Spin.show();
try{
this.updateTask();
} catch (error) {
console.error(e);
} finally {
this.$Spin.hide();
}
} else {
this.$Message.success('验证信息不通过');
}
@@ -444,6 +464,7 @@ export default {
} catch (e) {
//TODO zhuoda sentry
console.error(e);
} finally {
this.updateLoading = false;
}
},
@@ -464,6 +485,7 @@ export default {
} catch (e) {
//TODO zhuoda sentry
console.error(e);
} finally {
this.saveLoading = false;
}
},