diff --git a/src/components/bg-breadcrumb.vue b/src/components/bg-breadcrumb.vue index 5a7dd396e97751cd6bf08cd06c7bbe303134caf8..7779881d719f11c65abfe20e1493d2b4f7d1a005 100644 --- a/src/components/bg-breadcrumb.vue +++ b/src/components/bg-breadcrumb.vue @@ -1,117 +1,112 @@ - + diff --git a/src/page/main/auto-maintenance/task-manage/add/finish-use.vue b/src/page/main/auto-maintenance/task-manage/add/finish-use.vue new file mode 100644 index 0000000000000000000000000000000000000000..22446d4233919e07d64b08438db1f1f8122ae070 --- /dev/null +++ b/src/page/main/auto-maintenance/task-manage/add/finish-use.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/page/main/auto-maintenance/task-manage/add/finish.vue b/src/page/main/auto-maintenance/task-manage/add/finish.vue index 560d469bd0e118fa3407980a783015cef32b9eba..408c061cb533b79649d7db8b8a7c171a639785ed 100644 --- a/src/page/main/auto-maintenance/task-manage/add/finish.vue +++ b/src/page/main/auto-maintenance/task-manage/add/finish.vue @@ -2,8 +2,9 @@
-

新增成功

-
+

新增成功

+

新增失败

+
返回列表 继续新增
@@ -18,6 +19,13 @@ import { ElMessage } from "element-plus"; const router = useRouter(); const route = useRoute(); +const props = defineProps({ + state: { + type: Boolean, + default: true, + }, +}); + const emit = defineEmits(["clear"]); const goToList = () => { diff --git a/src/page/main/auto-maintenance/task-manage/add/index.vue b/src/page/main/auto-maintenance/task-manage/add/index.vue index 22422756da6551b90a56e37ba9597937fc23a577..1fb4d361ac8e8bcd2ed447f0903cccfc0b0b5344 100644 --- a/src/page/main/auto-maintenance/task-manage/add/index.vue +++ b/src/page/main/auto-maintenance/task-manage/add/index.vue @@ -39,19 +39,44 @@
-
+
- + +
-
- 取消 +
+ 取消 上一步 下一步 - 保存 + 保存 立即执行 + 返回列表 + 重新执行
+ + +
+
+ 向执行脚本传递额外的命令行变量。这是 + ansible-playbook 的 -e 或 --extra-vars 命令行参数。使用 YAML 或 JSON 提供键/值对,此项为非必填项。 +
+ +
+
+ +
+
+ +
@@ -64,6 +89,7 @@ import bgBreadcrumb from "@/components/bg-breadcrumb.vue"; import baseInfo from "./base-info.vue"; import useContent from "./use-content.vue"; import finish from "./finish.vue"; +import finishUse from "./finish-use.vue"; const router = useRouter(); const route = useRoute(); @@ -73,6 +99,11 @@ const useContentRef = ref(null); const state = reactive({ data: {}, + useScriptShow: false, + useType: 0, + useData: ["yaml", "json"], + useText: "", + isSave: true, }); const cancel = () => { @@ -82,34 +113,54 @@ const cancel = () => { const confirm = async (val) => { let flag = true; if (val == 1) { - if (step.value == 1) { - //下一步 - await baseInfoRef.value - .save() - .then() - .catch(() => { - flag = false; - }); - } else if (step.value == 2) { - //保存 - await useContentRef.value - .save() - .then(() => { - saveTask(); - }) - .catch(() => { - flag = false; - }); - } + await baseInfoRef.value + .save() + .then() + .catch(() => { + flag = false; + }); } if (flag) { step.value = step.value + val; } }; -const saveTask = () => {}; +//保存 +const saveTask = async () => { + await useContentRef.value + .save() + .then(() => { + step.value = 3; + //todo:掉接口保存,并获取状态 + }) + .catch(() => {}); +}; + +const useScript = async () => { + //填写完成才可以进行执行 + await useContentRef.value + .save() + .then(() => { + state.useScriptShow = true; + }) + .catch(() => { + ElMessage.error("请先完善表单再执行"); + }); +}; + +const cancelUse = () => { + state.useScriptShow = false; +}; -const useScript = () => {}; +const confirmUse = () => { + state.useScriptShow = false; + state.isSave = false; + step.value = 3; + // TODO:调用接口立即执行 + postScript(); +}; + +const postScript = () => {}; const clearData = () => { baseInfoRef.value.clear(); @@ -200,4 +251,14 @@ onBeforeMount(() => {}); .process_complete :deep(.el-step__head.is-finish .el-step__line) { background: linear-gradient(to right, #2b4695 100%, #e6e9ef 0%); } + +.dialog-tips { + height: 38px; + line-height: 38px; + background-color: #f7f7f9; + border-radius: 4px; + font-size: 14px; + color: #404a62; + margin-bottom: 16px; +} diff --git a/src/page/main/auto-maintenance/task-manage/index.vue b/src/page/main/auto-maintenance/task-manage/index.vue index b920fc23092981f0e073026e0cdcd19977a01699..308ee139146c2cdcf685ca14e362f648747fa09d 100644 --- a/src/page/main/auto-maintenance/task-manage/index.vue +++ b/src/page/main/auto-maintenance/task-manage/index.vue @@ -5,7 +5,7 @@