`
tpl += `
`
- tpl += `
`
- tpl += `
`
- tpl += `
${name}`
+ tpl += `
`
+ tpl += `
`
+ tpl += `
${name}`
tpl += `
`
tpl += `
`
- tpl += `
`
- if (runFlag === 'FORBIDDEN') {
- tpl += rtBantpl()
- }
- tpl += `
`
+ tpl += `
`
+ if (runFlag === 'FORBIDDEN') {
+ tpl += rtBantpl()
+ }
+ tpl += `
`
tpl += `
`
return tpl
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/common.js b/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js
similarity index 100%
rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/common.js
rename to escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/conditions.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
similarity index 56%
rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/conditions.vue
rename to escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
index fb5f4772ae..33d17967c1 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/conditions.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
@@ -11,7 +11,7 @@
type="daterange"
format="YYYY-MM-DD HH:mm:ss"
placement="bottom-end"
- v-model="datepicker"
+ :value="[searchParams.startDate,searchParams.endDate]"
:panelNum="2">