fix: 调度任务页面排版

src/views/monitor/job/index.vue

@@ -856,7 +856,7 @@ onMounted(() => {
       :title="modalState.title"
       @cancel="fnModalCancel"
     >
-      <a-form layout="horizontal">
+      <a-form layout="horizontal" :label-col="{ span: 6 }" :label-wrap="true">
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item :label="t('views.monitor.job.jobName')" name="jobName">
@@ -871,33 +871,6 @@ onMounted(() => {
               }}
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="6" :xs="24" v-if="false">
-            <a-form-item
-              :label="t('views.monitor.job.misfirePolicy')"
-              name="misfirePolicy"
-            >
-              {{
-                [
-                  t('views.monitor.job.misfirePolicy1'),
-                  t('views.monitor.job.misfirePolicy2'),
-                  t('views.monitor.job.misfirePolicy3'),
-                ][+modalState.from.misfirePolicy - 1]
-              }}
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="6" :xs="24" v-if="false">
-            <a-form-item
-              :label="t('views.monitor.job.concurrent')"
-              name="concurrent"
-            >
-              {{
-                [
-                  t('views.monitor.job.concurrent0'),
-                  t('views.monitor.job.concurrent1'),
-                ][+modalState.from.concurrent]
-              }}
-            </a-form-item>
-          </a-col>
         </a-row>
 
         <a-row :gutter="16">
@@ -946,6 +919,8 @@ onMounted(() => {
         <a-form-item
           :label="t('views.monitor.job.createTime')"
           name="createTime"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
         >
           <span v-if="+modalState.from.createTime > 0">
             {{ parseDateToStr(+modalState.from.createTime) }}
@@ -955,12 +930,27 @@ onMounted(() => {
         <a-form-item
           :label="t('views.monitor.job.targetParams')"
           name="targetParams"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
         >
-          {{ modalState.from.targetParams }}
+          <a-textarea
+            v-model:value="modalState.from.targetParams"
+            :auto-size="{ minRows: 2, maxRows: 6 }"
+            :disabled="true"
+          />
         </a-form-item>
 
-        <a-form-item :label="t('views.monitor.job.remark')" name="remark">
-          {{ modalState.from.remark }}
+        <a-form-item
+          :label="t('views.monitor.job.remark')"
+          name="remark"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+        >
+          <a-textarea
+            v-model:value="modalState.from.remark"
+            :auto-size="{ minRows: 2, maxRows: 6 }"
+            :disabled="true"
+          />
         </a-form-item>
       </a-form>
       <template #footer>
@@ -981,7 +971,12 @@ onMounted(() => {
       @ok="fnModalOk"
       @cancel="fnModalCancel"
     >
-      <a-form name="modalStateFrom" layout="horizontal">
+      <a-form
+        name="modalStateFrom"
+        layout="horizontal"
+        :label-col="{ span: 6 }"
+        :label-wrap="true"
+      >
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1007,74 +1002,9 @@ onMounted(() => {
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="6" :xs="24" v-if="false">
-            <a-form-item
-              :label="t('views.monitor.job.misfirePolicy')"
-              name="misfirePolicy"
-            >
-              <a-select
-                :disabled="true"
-                v-model:value="modalState.from.misfirePolicy"
-                default-value="3"
-                :placeholder="t('common.selectPlease')"
-              >
-                <a-select-option key="1" value="1">
-                  {{ t('views.monitor.job.misfirePolicy1') }}
-                </a-select-option>
-                <a-select-option key="2" value="2">
-                  {{ t('views.monitor.job.misfirePolicy2') }}
-                </a-select-option>
-                <a-select-option key="3" value="3">
-                  {{ t('views.monitor.job.misfirePolicy3') }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="6" :xs="24" v-if="false">
-            <a-form-item
-              :label="t('views.monitor.job.concurrent')"
-              name="concurrent"
-            >
-              <a-select
-                :disabled="true"
-                v-model:value="modalState.from.concurrent"
-                default-value="0"
-                :placeholder="t('common.selectPlease')"
-              >
-                <a-select-option key="1" value="1">
-                  {{ t('views.monitor.job.concurrent1') }}
-                </a-select-option>
-                <a-select-option key="0" value="0">
-                  {{ t('views.monitor.job.concurrent0') }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
         </a-row>
 
         <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.monitor.job.invokeTarget')"
-              name="invokeTarget"
-              v-bind="modalStateFrom.validateInfos.invokeTarget"
-            >
-              <a-input
-                v-model:value="modalState.from.invokeTarget"
-                allow-clear
-                :placeholder="t('views.monitor.job.invokeTargetPlease')"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      <div>{{ t('views.monitor.job.invokeTargetTip') }}</div>
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.monitor.job.jobGroup')"
@@ -1089,46 +1019,7 @@ onMounted(() => {
               </a-select>
             </a-form-item>
           </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="16" :md="16" :xs="24">
-            <a-form-item
-              :label="t('views.monitor.job.cronExpression')"
-              name="cronExpression"
-              :label-col="{ span: 4 }"
-              v-bind="modalStateFrom.validateInfos.cronExpression"
-            >
-              <a-input
-                v-model:value="modalState.from.cronExpression"
-                allow-clear
-                :placeholder="t('views.monitor.job.cronExpressionPlease')"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      <div>
-                        {{ t('views.monitor.job.cronExpressionTip') }}<br />
-                        {{ t('views.monitor.job.cronExpressionTip1') }}
-                      </div>
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-                <template #addonAfter>
-                  <a-button
-                    type="text"
-                    size="small"
-                    @click.prevent="fnModalCron(true)"
-                  >
-                    <template #icon><FieldTimeOutlined /></template>
-                    {{ t('views.monitor.job.cronExpressionNew') }}
-                  </a-button>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="8" :md="8" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item :label="t('views.monitor.job.saveLog')" name="saveLog">
               <a-select
                 v-model:value="modalState.from.saveLog"
@@ -1141,10 +1032,70 @@ onMounted(() => {
           </a-col>
         </a-row>
 
+        <a-form-item
+          :label="t('views.monitor.job.invokeTarget')"
+          name="invokeTarget"
+          v-bind="modalStateFrom.validateInfos.invokeTarget"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+        >
+          <a-input
+            v-model:value="modalState.from.invokeTarget"
+            allow-clear
+            :placeholder="t('views.monitor.job.invokeTargetPlease')"
+          >
+            <template #prefix>
+              <a-tooltip placement="topLeft">
+                <template #title>
+                  <div>{{ t('views.monitor.job.invokeTargetTip') }}</div>
+                </template>
+                <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
+              </a-tooltip>
+            </template>
+          </a-input>
+        </a-form-item>
+
+        <a-form-item
+          :label="t('views.monitor.job.cronExpression')"
+          name="cronExpression"
+          v-bind="modalStateFrom.validateInfos.cronExpression"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+        >
+          <a-input
+            v-model:value="modalState.from.cronExpression"
+            allow-clear
+            :placeholder="t('views.monitor.job.cronExpressionPlease')"
+          >
+            <template #prefix>
+              <a-tooltip placement="topLeft">
+                <template #title>
+                  <div>
+                    {{ t('views.monitor.job.cronExpressionTip') }}<br />
+                    {{ t('views.monitor.job.cronExpressionTip1') }}
+                  </div>
+                </template>
+                <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
+              </a-tooltip>
+            </template>
+            <template #addonAfter>
+              <a-button
+                type="text"
+                size="small"
+                @click.prevent="fnModalCron(true)"
+              >
+                <template #icon><FieldTimeOutlined /></template>
+                {{ t('views.monitor.job.cronExpressionNew') }}
+              </a-button>
+            </template>
+          </a-input>
+        </a-form-item>
+
         <a-form-item
           :label="t('views.monitor.job.targetParams')"
           name="targetParams"
-          :label-col="{ span: 4 }"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
         >
           <a-textarea
             v-model:value="modalState.from.targetParams"
@@ -1157,7 +1108,8 @@ onMounted(() => {
         <a-form-item
           :label="t('views.monitor.job.remark')"
           name="remark"
-          :label-col="{ span: 4 }"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
         >
           <a-textarea
             v-model:value="modalState.from.remark"

src/views/monitor/job/log.vue

@@ -44,6 +44,8 @@ let queryRangePicker = ref<[string, string]>(['', '']);
 
 /**查询参数 */
 let queryParams = reactive({
+  /**任务ID */
+  jobId: '',
   /**任务名称 */
   jobName: '',
   /**任务组名 */
@@ -72,6 +74,7 @@ function fnQueryReset() {
     });
   } else {
     queryParams = Object.assign(queryParams, {
+      jobId: '',
       jobName: '',
       jobGroup: undefined,
       status: undefined,
@@ -393,6 +396,7 @@ onMounted(() => {
   if (jobId && jobId !== '0') {
     getJob(jobId).then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
+        queryParams.jobId = res.data.jobId;
         queryParams.jobName = res.data.jobName;
         queryParams.jobGroup = res.data.jobGroup;
         fnGetList();
@@ -415,14 +419,13 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24" v-if="jobId !== '0'">
             <a-form-item
               :label="t('views.monitor.jobLog.jobName')"
               name="jobName"
             >
               <a-input
                 v-model:value="queryParams.jobName"
-                :allow-clear="jobId === '0'"
                 :disabled="jobId !== '0'"
                 :placeholder="t('common.inputPlease')"
               ></a-input>
@@ -636,7 +639,7 @@ onMounted(() => {
       :title="modalState.title"
       @cancel="fnModalCancel"
     >
-      <a-form layout="horizontal">
+      <a-form layout="horizontal" :label-col="{ span: 6 }" :label-wrap="true">
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item :label="t('common.rowId')" name="jobLogId">
@@ -703,6 +706,8 @@ onMounted(() => {
         <a-form-item
           :label="t('views.monitor.jobLog.targetParams')"
           name="targetParams"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
         >
           <a-textarea
             v-model:value="modalState.from.targetParams"
@@ -710,7 +715,12 @@ onMounted(() => {
             :disabled="true"
           />
         </a-form-item>
-        <a-form-item :label="t('views.monitor.jobLog.jobMsg')" name="jobMsg">
+        <a-form-item
+          :label="t('views.monitor.jobLog.jobMsg')"
+          name="jobMsg"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+        >
           <a-textarea
             v-model:value="modalState.from.jobMsg"
             :auto-size="{ minRows: 2, maxRows: 6 }"