diff --git a/src/views/farm/project/index.vue b/src/views/farm/project/index.vue
index a4885fd..69bc009 100644
--- a/src/views/farm/project/index.vue
+++ b/src/views/farm/project/index.vue
@@ -1,3 +1,10 @@
+ <style>
+   .el-table .cell.el-tooltip {
+       white-space: pre-wrap;
+   }
+ </style>
+
+
 <template>
   <div class="app-container">
 
@@ -49,16 +56,21 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+    <el-table v-loading="loading" :data="list" style="white-space: pre-wrap;">
       <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="resource" >
-        <template slot-scope="scope">
-          <span> {{resourceList.find(t=>t.id == scope.row.resources ).name}}  </span>
-        </template>
+      
+      <el-table-column label="资源名" align="center" prop="resources" />
+
+      <el-table-column label="图片" align="center" prop="images">
+          <template slot-scope="scope">
+            <el-image style="" :src="scope.row.images.split(',')[0]"
+            :preview-src-list="scope.row.images.split(',')">
+            </el-image>
+          </template>
       </el-table-column>
-      <el-table-column label="图片" align="center" prop="images" />
+
       <el-table-column label="开始时间" align="center" prop="planStartTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planStartTime) }}</span>
@@ -69,7 +81,7 @@
           <span>{{ parseTime(scope.row.planEndTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="重量" align="center" prop="weight" />
+      <el-table-column label="优先级" align="center" prop="weight" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -91,38 +103,36 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="" prop="name">
+        <el-form-item label="项目名" prop="name">
           <el-input v-model="form.name" placeholder="请输入" />
         </el-form-item>
-        <el-form-item label="">
+        <el-form-item label="项目内容">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-       <!-- <el-form-item label="资源类型：" prop="resourceType">
-          <el-select v-model="form.resources" placeholder="请选择">
-            <el-option v-for="item in resourceList" :label="item.name" :value="item.id" :key="item.id" />
-          </el-select>
-        </el-form-item> -->
-
 
-          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">
-            全选
-          </el-checkbox>
-
-          <el-checkbox-group v-model="resourceList" @change="handleFilter">
-                <el-checkbox v-for="col in resourceList" :key="col.id" :label="col.name" style="width: 130px; margin: 6px 0">{{col.name}}</el-checkbox>
-          </el-checkbox-group>
+        <el-form-item label="资源选择">
+          <el-select  v-model="selectResourceList" multiple placeholder="请选择">
+            <el-option
+              v-for="item in resourceList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+              {{item.name}}
+            </el-option>
+          </el-select>
+        </el-form-item>
 
         <el-form-item label="项目图片">
           <imageUpload v-model="form.images"/>
         </el-form-item>
-        <el-form-item label="" prop="planStartTime">
-          <el-date-picker clearable v-model="form.planStartTime" type="date" value-format="yyyy-MM-dd" placeholder="选择" />
+        <el-form-item label="项目开始时间" prop="planStartTime">
+          <el-date-picker clearable v-model="form.planStartTime" type="date" value-format="timestamp" placeholder="选择" />
         </el-form-item>
-        <el-form-item label="" prop="planEndTime">
-          <el-date-picker clearable v-model="form.planEndTime" type="date" value-format="yyyy-MM-dd" placeholder="选择" />
+        <el-form-item label="项目结束时间" prop="planEndTime">
+          <el-date-picker clearable v-model="form.planEndTime" type="date" value-format="timestamp" placeholder="选择" />
         </el-form-item>
-        <el-form-item label="" prop="weight">
-          <el-input v-model="form.weight" placeholder="请输入" />
+        <el-form-item label="优先级" prop="weight">
+          <el-input v-model="form.weight" placeholder="请输入数字(1第一优先,99最后优先)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -139,6 +149,8 @@ import ImageUpload from '@/components/ImageUpload';
 import Editor from '@/components/Editor';
 import { getResourcePage } from "@/api/farm/resource";
 
+
+
 export default {
   name: "Project",
   components: {
@@ -180,17 +192,27 @@ export default {
       rules: {
       },
       resourceList:[],
-      checkAll: false,
-      isIndeterminate: true
+      //下拉多选框 默认为null
+      selectResourceList:[],
 
     };
   },
   created() {
-    this.getList();
     this.getResource();
+    this.getList();
   },
   methods: {
-    /** 查询列表 */
+    /**查询资源*/
+    getResource(){
+      getResourcePage({
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+      }).then(res=>{
+        this.resourceList = res.data.list;
+      })
+    },
+    /** 查询项目列表 */
     getList() {
       this.loading = true;
       // 处理查询参数
@@ -200,21 +222,27 @@ export default {
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
       getProjectPage(params).then(response => {
+        //1 循环list
+        response.data.list.forEach(element => {
+          element.resources = JSON.parse(element.resources);
+          //2 循环每个list对象的resource
+          let resourceName = '';
+          element.resources.forEach((inn) =>{
+            //3 每个resouce循环比较 resourceList，取得名字
+            this.resourceList.forEach((resource) =>{
+                if(inn == resource.id){
+                  resourceName += (resource.name + ",");
+                }
+              }
+            )
+          })
+          element.resources = resourceName;
+        });
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
       });
     },
-    /**查询资源*/
-    getResource(){
-      getResourcePage({
-        pageNo: 1,
-        pageSize: 10,
-        name: null,
-      }).then(res=>{
-        this.resourceList = res.data.list;
-      })
-    },
 
     /** 取消按钮 */
     cancel() {
@@ -260,6 +288,9 @@ export default {
       const id = row.id;
       getProject(id).then(response => {
         this.form = response.data;
+        let array = JSON.parse(response.data.resources);
+        this.form.resources = array;
+        this.selectResourceList = array;
         this.open = true;
         this.title = "修改农场项目";
       });
@@ -267,15 +298,12 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        console.log(this.form.resources);
-        console.log("sssss");
         if (!valid) {
           return;
         }
-        console.log("22222222222");
+        this.form.resources = JSON.stringify(this.selectResourceList);
         // 修改的提交
         if (this.form.id != null) {
-          console.log("3333333333")
           updateProject(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
@@ -285,10 +313,7 @@ export default {
         }
         // 添加的提交
         createProject(this.form).then(response => {
-          console.log("111111111");
            this.form.resources = JSON.stringify(this.form.resources);
-          console.log(this.form.getResource);
-          console.log(this.form.resources);
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -322,21 +347,6 @@ export default {
           this.$download.excel(response, '${table.classComment}.xls');
           this.exportLoading = false;
         }).catch(() => {});
-    },
-
-    handleCheckAllChange(val) {  //监听全选按钮的变化
-    console.log("全选", val);
-    console.log(this.resourceList);
-    console.log(val = this.resourceList);
-      this.resourceList = val ? this.resourceList : [];
-      this.isIndeterminate = false;
-    },
-    handleFilter(value) {  //监听所有数据的被选择情况
-    console.log("AAAAAAAAA");
-    console.log(value);
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.resourceList.length;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.resourceList.length;
     }