From b5973eb84ffc1923dbaa94b8080b75ef8f72535f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E5=9D=A1?= <zhangyupo@yunjiazheng.com>
Date: Wed, 7 Mar 2018 14:22:27 +0800
Subject: [PATCH] =?UTF-8?q?U=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=86=E7=BB=84=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Dockerfile/Dockerfile               |  1 +
 spug_web/src/components/schedule/Job.vue | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/Dockerfile/Dockerfile b/docs/Dockerfile/Dockerfile
index df21975..ca51ec9 100644
--- a/docs/Dockerfile/Dockerfile
+++ b/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 
diff --git a/spug_web/src/components/schedule/Job.vue b/spug_web/src/components/schedule/Job.vue
index cbad5e7..3908bb9 100644
--- a/spug_web/src/components/schedule/Job.vue
+++ b/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>