From 86b72b77f09b2acee1aaa7a2ee1ccdbe5458b7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com>
Date: Thu, 16 Jun 2022 16:23:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81=E5=88=97=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/farm/project/index.vue |  9 ++++++++-
 src/views/farm/task/index.vue    | 11 +++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/farm/project/index.vue b/src/views/farm/project/index.vue
index a0f30f9..1fed10c 100644
--- a/src/views/farm/project/index.vue
+++ b/src/views/farm/project/index.vue
@@ -53,8 +53,15 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list" stripe >
       <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="项目状态" align="center" prop="state" >
+        <template slot-scope="scope">
+          <el-button type="success" v-if="scope.row.state == 0">计划中</el-button>
+          <el-button type="success" v-if="scope.row.state == 1">进行中</el-button>
+          <el-button type="success" v-if="scope.row.state == 2">已完成</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="项目名" align="center" prop="name" />
-      <el-table-column label="项目内容" align="center" prop="content" />
+      <!-- <el-table-column label="项目内容" align="center" prop="content" /> -->
       <el-table-column label="区域名" align="center" prop="areas" width="80" >
         <template slot-scope="scope">
           <span>{{areasConvert(scope.row.areas)}}</span>
diff --git a/src/views/farm/task/index.vue b/src/views/farm/task/index.vue
index 9bcf474..7a50ce4 100644
--- a/src/views/farm/task/index.vue
+++ b/src/views/farm/task/index.vue
@@ -47,6 +47,17 @@
     <!-- 列表 -->
     <el-table v-loading="loading" stripe :data="list">
       <el-table-column label="任务ID" align="center" prop="id" />
+      <el-table-column label="任务状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <el-button type="success" v-if="scope.row.status == 0">计划中</el-button>
+          <el-button type="success" v-if="scope.row.status == 1">准备中</el-button>
+          <el-button type="success" v-if="scope.row.status == 2">已开始</el-button>
+          <el-button type="danger" v-if="scope.row.status == 3">异常状态</el-button>
+          <el-button type="success" v-if="scope.row.status == 4">任务完成</el-button>
+          <el-button type="danger" v-if="scope.row.status == 5">返工</el-button>
+          <el-button type="danger" v-if="scope.row.status == 6">任务关闭</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="项目名" align="center" prop="projectName">
         <template slot-scope="scope">
           <span>{{scope.row.projectName}}</span>