From cf00693e8a5cb5ec3be3bf46dc4c69269a056fb2 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, 21 Apr 2022 10:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/farm/discuss/index.vue |  6 +++---
 src/views/farm/project/index.vue | 14 ++++++--------
 src/views/farm/task/index.vue    | 15 +++++++++++----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/farm/discuss/index.vue b/src/views/farm/discuss/index.vue
index c52f758..43c2ac4 100644
--- a/src/views/farm/discuss/index.vue
+++ b/src/views/farm/discuss/index.vue
@@ -3,13 +3,13 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="" prop="projectId">
+      <el-form-item label="项目名" prop="projectId">
         <el-input v-model="queryParams.projectId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="" prop="taskId">
+      <el-form-item label="任务名" prop="taskId">
         <el-input v-model="queryParams.taskId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="">
+      <el-form-item label="讨论发表时间">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
diff --git a/src/views/farm/project/index.vue b/src/views/farm/project/index.vue
index 2b84fb8..5d3870c 100644
--- a/src/views/farm/project/index.vue
+++ b/src/views/farm/project/index.vue
@@ -1,7 +1,7 @@
  <style>
-   .el-table .cell.el-tooltip {
-       white-space: pre-wrap;
-   }
+  .el-table .cell{
+    white-space: pre-line;
+  }
  </style>
 
 
@@ -53,12 +53,12 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list" stripe style="white-space: pre-wrap;">
+    <el-table v-loading="loading" :data="list" stripe >
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="项目名" align="center" prop="name" />
       <el-table-column label="项目内容" align="center" prop="content" />
       
-      <el-table-column label="资源名" align="center" prop="resources" />
+      <el-table-column label="资源名" align="center" prop="resources"/>
 
       <el-table-column label="图片" align="center" prop="images">
           <template slot-scope="scope">
@@ -146,8 +146,6 @@ import ImageUpload from '@/components/ImageUpload';
 import Editor from '@/components/Editor';
 import { getResourcePage } from "@/api/farm/resource";
 
-
-
 export default {
   name: "Project",
   components: {
@@ -228,7 +226,7 @@ export default {
             //3 每个resouce循环比较 resourceList，取得名字
             this.resourceList.forEach((resource) =>{
                 if(inn == resource.id){
-                  resourceName += (resource.name + ",");
+                  resourceName += (resource.name + "、\n");
                 }
               }
             )
diff --git a/src/views/farm/task/index.vue b/src/views/farm/task/index.vue
index 9782b01..78814dd 100644
--- a/src/views/farm/task/index.vue
+++ b/src/views/farm/task/index.vue
@@ -1,3 +1,9 @@
+ <style>
+  .el-table .cell{
+    white-space: pre-line;
+  }
+ </style>
+
 <template>
   <div class="app-container">
 
@@ -186,7 +192,6 @@ export default {
   },
   created() {
     this.getResource();
-    this.getList();
   },
   methods: {
     /**查询资源*/
@@ -197,6 +202,7 @@ export default {
         name: null,
       }).then(res=>{
         this.resourceList = res.data.list;
+        this.getList();
       })
     },
     /** 查询任务列表 */
@@ -226,7 +232,8 @@ export default {
           //3 每个resouce循环比较 resourceList，取得名字
           this.resourceList.forEach((resource) =>{
               if(inn == resource.id){
-                resourceName += (resource.name + ",");
+                resourceName += (resource.name + "、\n");
+                console.log("11", resourceName);
               }
             }
           )
@@ -276,7 +283,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加农场项目";
+      this.title = "添加农场任务";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -296,7 +303,7 @@ export default {
         }
 
         this.open = true;
-        this.title = "修改农场项目";
+        this.title = "修改农场任务";
       });
     },
     /** 提交按钮 */