diff --git a/src/api/model/dpm.js b/src/api/model/dpm.js index 86779134..b9e30059 100644 --- a/src/api/model/dpm.js +++ b/src/api/model/dpm.js @@ -86,6 +86,39 @@ export default { } }, }, + checktaskset: { + list: { + name: "列表", + req: async function(data){ + return await http.get( + `${config.API_URL}/dpm/checktaskset/`, + data + ); + } + }, + create: { + name: "创建", + req: async function(data){ + return await http.post( + `${config.API_URL}/dpm/checktaskset/`, + data); + } + }, + delete: { + name: "删除", + req: async function(id){ + return await http.delete( + `${config.API_URL}/dpm/checktaskset/${id}/`); + } + }, + toggle: { + name: "变更", + req: async function(id){ + return await http.put( + `${config.API_URL}/dpm/checktaskset/${id}/toggle/`); + } + }, + }, checkwork: { list: { name: "列表", diff --git a/src/utils/enum.js b/src/utils/enum.js index 55662153..cf04fb8e 100644 --- a/src/utils/enum.js +++ b/src/utils/enum.js @@ -184,4 +184,4 @@ export const schedulePeriodEnum = new EnumFactory({ 'minutes': '分钟', 'hours': '小时', 'days': '天', -}, parseInt) \ No newline at end of file +}) \ No newline at end of file diff --git a/src/views/dpm/checktaskset.vue b/src/views/dpm/checktaskset.vue index 817b201d..050efc71 100644 --- a/src/views/dpm/checktaskset.vue +++ b/src/views/dpm/checktaskset.vue @@ -20,15 +20,21 @@ width="80" > + > + + + diff --git a/src/views/dpm/risk.vue b/src/views/dpm/risk.vue index 525580a3..7f06e526 100644 --- a/src/views/dpm/risk.vue +++ b/src/views/dpm/risk.vue @@ -9,11 +9,61 @@ hideDo style="height: 400px" > + + + + + + + + diff --git a/src/views/dpm/risk_form.vue b/src/views/dpm/risk_form.vue new file mode 100644 index 00000000..d57ea59b --- /dev/null +++ b/src/views/dpm/risk_form.vue @@ -0,0 +1,112 @@ + + \ No newline at end of file diff --git a/src/views/dpm/riskpoint.vue b/src/views/dpm/riskpoint.vue index 103562fb..593173c5 100644 --- a/src/views/dpm/riskpoint.vue +++ b/src/views/dpm/riskpoint.vue @@ -174,11 +174,14 @@ - + + + + - + + + + @@ -357,9 +366,10 @@ import { riskLevelEnum, manageLevelEnum, riskTypeEnum } from "@/utils/enum.js"; import Risk from "./risk.vue"; import CheckTaskSet from "./checktaskset.vue"; import MySchedule from "@/views/sys/myschedule.vue"; +import RiskForm from "./risk_form.vue"; const defaultForm = {}; export default { - components: { Risk, CheckTaskSet, MySchedule}, + components: { Risk, CheckTaskSet, MySchedule, RiskForm}, data() { return { riskTypeEnum, @@ -368,13 +378,14 @@ export default { formSaving: false, saveDialog: false, saveDialog2: false, + riskDialog: false, choseMyScheduleDialog: false, query: { search: "", }, apiObj: this.$API.dpm.riskpoint.list, saveForm: Object.assign({}, defaultForm), - saveForm2: {}, + saveForm2: {"expire": 0}, deptOptions: [], rowData: {}, xoptions: ["风险列表", "排查任务配置"], @@ -386,8 +397,27 @@ export default { this.getAreaOptions(); }, methods: { + updateRisk(row) { + this.riskDialog = true; + this.$nextTick(() => { + this.$refs.riskForm.setData(row); + }); + }, + riskConfirm(){ + this.riskDialog = false; + this.$refs.riskTable.handleQuery(); + }, + risk_add() { + this.riskDialog = true; + }, + scheduleChose(item){ + this.saveForm2.myschedule = item.id; + this.saveForm2.myschedule_name = item.name; + this.choseMyScheduleDialog = false; + }, checktaskset_add() { this.saveDialog2 = true; + this.saveForm2 = {"expire": 0}; }, rowClick(row) { this.rowData = row; @@ -426,7 +456,27 @@ export default { this.handleQuery(); }); }, + formSubmit2() { + this.$refs.saveForm2.validate((valid)=>{ + if(valid){ + this.formSaving = true; + this.$API.dpm.checktaskset.create + .req(this.saveForm2) + .then((res) => { + this.formSaving = false; + this.$message.success("创建成功"); + this.$refs.checktasksetTable.handleQuery(); + }) + .catch((err) => { + this.formSaving = false; + }); + } + }) + + }, formSubmit() { + this.$refs.saveForm.validate((valid) => { + if (valid) { this.formSaving = true; if (this.saveForm.id) { this.$API.dpm.riskpoint.update @@ -452,7 +502,8 @@ export default { .catch((err) => { this.formSaving = false; }); - } + }} + }); }, }, }; diff --git a/src/views/sys/myschedule.vue b/src/views/sys/myschedule.vue index 74e32552..8f29a37d 100644 --- a/src/views/sys/myschedule.vue +++ b/src/views/sys/myschedule.vue @@ -1,9 +1,9 @@