Kaynağa Gözat

U 任务管理 统一任务管理页面分组描述

张玉坡 7 yıl önce
ebeveyn
işleme
b5973eb84f

+ 1 - 0
docs/Dockerfile/Dockerfile

@@ -4,6 +4,7 @@ RUN echo -e "http://mirrors.aliyun.com/alpine/v3.6/main\nhttp://mirrors.aliyun.c
 RUN apk update && apk add --no-cache ca-certificates python3 nginx mariadb nodejs-npm git 
 RUN apk add --no-cache --virtual .build-deps python3-dev gcc musl-dev libffi-dev openssl-dev make \
     && git clone https://github.com/openspug/spug.git /spug \
+    && git pull \
     && pip3 install --no-cache-dir -r /spug/spug_api/requirements.txt \
     && pip3 install --no-cache-dir gunicorn \	
     && apk del .build-deps 

+ 5 - 5
spug_web/src/components/schedule/Job.vue

@@ -2,7 +2,7 @@
     <div>
         <el-row>
             <el-col :span="8">
-                <el-select v-model="job_group" @change="group_Search()" clearable placeholder="任务组">
+                <el-select v-model="job_group" @change="group_Search()" clearable placeholder="任务组">
                     <el-option v-for="item in groups" :key="item" :value="item"></el-option>
                 </el-select>
             </el-col>
@@ -15,7 +15,7 @@
             <el-table :data="tableData.data" v-loading="tableLoading"
                       :default-sort = "{prop: 'next_run_time'}"
                        style="width: 100%; margin-top: 20px">
-                <el-table-column prop="group" label="组" sortable></el-table-column>
+                <el-table-column prop="group" label="组" sortable></el-table-column>
                 <el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="desc" label="描述" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="command" label="任务命令" show-overflow-tooltip></el-table-column>
@@ -59,11 +59,11 @@
         </el-row>
         <el-dialog title="任务编辑" :visible.sync="dialogAddVisible" :close-on-click-modal="false">
             <el-form label-width="80px">
-                <el-form-item label="任务组" required>
-                    <el-select v-model="form.group" placeholder="选择任务组">
+                <el-form-item label="任务组" required>
+                    <el-select v-model="form.group" placeholder="选择任务组">
                         <el-option v-for="g in groups" :value="g" :key="g"></el-option>
                     </el-select>
-                    <el-button style="margin-left: 15px" type="text" @click="addGroup">添加任务组</el-button>
+                    <el-button style="margin-left: 15px" type="text" @click="addGroup">添加任务组</el-button>
                 </el-form-item>
                 <el-form-item label="任务名称" required>
                     <el-input v-model="form.name" placeholder="请输入任务名称"></el-input>