作业区域选择

src/api/farm/area.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建
+export function createArea(data) {
+  return request({
+    url: '/farm/area/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新
+export function updateArea(data) {
+  return request({
+    url: '/farm/area/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function deleteArea(id) {
+  return request({
+    url: '/farm/area/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得
+export function getArea(id) {
+  return request({
+    url: '/farm/area/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得分页
+export function getAreaPage(query) {
+  return request({
+    url: '/farm/area/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出 Excel
+export function exportAreaExcel(query) {
+  return request({
+    url: '/farm/area/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/farm/area/index.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <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>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['farm:area:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['farm:area:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="区域名" align="center" prop="name" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['farm:area:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['farm:area:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <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-input v-model="form.name" placeholder="请输入" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createArea, updateArea, deleteArea, getArea, getAreaPage, exportAreaExcel } from "@/api/farm/area";
+
+export default {
+  name: "Area",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getAreaPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getArea(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateArea(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createArea(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除编号为"' + id + '"的数据项?').then(function() {
+          return deleteArea(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+          this.exportLoading = true;
+          return exportAreaExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/farm/project/index.vue

@@ -3,6 +3,11 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="资源" prop="resource">
+        <el-select v-model="queryParams.resource" placeholder="请选择" clearable size="small">
+          <el-option v-for="item in resourceList" :label="item.name" :value="item.id" :key="item.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -45,23 +50,27 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="" align="center" prop="name" />
+      <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="resources" />
+      <el-table-column label="资源名" align="center" prop="resource" >
-      <el-table-column label="" align="center" prop="images" />
+        <template slot-scope="scope">
-      <el-table-column label="" align="center" prop="planStartTime" width="180">
+          <span> {{resourceList.find(t=>t.id == scope.row.resources ).name}}  </span>
+        </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>
         </template>
       </el-table-column>
-      <el-table-column label="" align="center" prop="planEndTime" width="180">
+      <el-table-column label="结束时间" align="center" prop="planEndTime" width="180">
         <template slot-scope="scope">
           <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">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -88,10 +97,22 @@
         <el-form-item label="">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="" prop="resources">
+       <!-- <el-form-item label="资源类型：" prop="resourceType">
-          <el-input v-model="form.resources" placeholder="请输入" />
+          <el-select v-model="form.resources" placeholder="请选择">
-        </el-form-item>
+            <el-option v-for="item in resourceList" :label="item.name" :value="item.id" :key="item.id" />
-        <el-form-item label="">
+          </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="项目图片">
           <imageUpload v-model="form.images"/>
         </el-form-item>
         <el-form-item label="" prop="planStartTime">
@@ -116,6 +137,7 @@
 import { createProject, updateProject, deleteProject, getProject, getProjectPage, exportProjectExcel } from "@/api/farm/project";
 import ImageUpload from '@/components/ImageUpload';
 import Editor from '@/components/Editor';
+import { getResourcePage } from "@/api/farm/resource";
 
 export default {
   name: "Project",
@@ -156,11 +178,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      resourceList:[],
+      checkAll: false,
+      isIndeterminate: true
+
     };
   },
   created() {
     this.getList();
+    this.getResource();
   },
   methods: {
     /** 查询列表 */
@@ -178,6 +205,17 @@ export default {
         this.loading = false;
       });
     },
+    /**查询资源*/
+    getResource(){
+      getResourcePage({
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+      }).then(res=>{
+        this.resourceList = res.data.list;
+      })
+    },
+
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -229,11 +267,15 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        console.log(this.form.resources);
+        console.log("sssss");
         if (!valid) {
           return;
         }
+        console.log("22222222222");
         // 修改的提交
         if (this.form.id != null) {
+          console.log("3333333333")
           updateProject(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
@@ -243,6 +285,10 @@ 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();
@@ -276,7 +322,25 @@ 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;
     }
+
+    
+
   }
 };
 </script>