农机故障告警和农机作业记录

src/api/base/machineAlarmRecords.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询农机故障告警记录列表
+export function listMachineAlarmRecords(query) {
+  return request({
+    url: '/base/machineAlarmRecords/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询农机故障告警记录详细
+export function getMachineAlarmRecords(id) {
+  return request({
+    url: '/base/machineAlarmRecords/' + id,
+    method: 'get'
+  })
+}
+
+// 新增农机故障告警记录
+export function addMachineAlarmRecords(data) {
+  return request({
+    url: '/base/machineAlarmRecords',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改农机故障告警记录
+export function updateMachineAlarmRecords(data) {
+  return request({
+    url: '/base/machineAlarmRecords',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除农机故障告警记录
+export function delMachineAlarmRecords(id) {
+  return request({
+    url: '/base/machineAlarmRecords/' + id,
+    method: 'delete'
+  })
+}

src/api/base/machineWorkRecords.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询农机作业记录列表
+export function listMachineWorkRecords(query) {
+  return request({
+    url: '/base/machineWorkRecords/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询农机作业记录详细
+export function getMachineWorkRecords(id) {
+  return request({
+    url: '/base/machineWorkRecords/' + id,
+    method: 'get'
+  })
+}
+
+// 新增农机作业记录
+export function addMachineWorkRecords(data) {
+  return request({
+    url: '/base/machineWorkRecords',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改农机作业记录
+export function updateMachineWorkRecords(data) {
+  return request({
+    url: '/base/machineWorkRecords',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除农机作业记录
+export function delMachineWorkRecords(id) {
+  return request({
+    url: '/base/machineWorkRecords/' + id,
+    method: 'delete'
+  })
+}

src/views/base/machineAlarmRecords/index.vue

@@ -0,0 +1,467 @@
+<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="农机ID" prop="machineId">
+        <el-input
+          v-model="queryParams.machineId"
+          placeholder="请输入农机ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="报警类型" prop="alarmType">
+        <el-select v-model="queryParams.alarmType" placeholder="请选择报警类型" clearable>
+          <el-option
+            v-for="dict in dict.type.machine_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报警级别" prop="alarmLevel">
+        <el-select v-model="queryParams.alarmLevel" placeholder="请选择报警级别" clearable>
+          <el-option
+            v-for="dict in dict.type.machine_alarm_level"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报警时间" prop="alarmTime">
+        <el-date-picker clearable
+          v-model="queryParams.alarmTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择报警时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="报警位置信息" prop="locationInfo">
+        <el-input
+          v-model="queryParams.locationInfo"
+          placeholder="请输入报警位置信息"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理状态" prop="handledStatus">
+        <el-select v-model="queryParams.handledStatus" placeholder="请选择处理状态" clearable>
+          <el-option
+            v-for="dict in dict.type.machine_handled_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="处理人ID" prop="handlerId">
+        <el-input
+          v-model="queryParams.handlerId"
+          placeholder="请输入处理人ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理人姓名" prop="handlerName">
+        <el-input
+          v-model="queryParams.handlerName"
+          placeholder="请输入处理人姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理时间" prop="handleTime">
+        <el-date-picker clearable
+          v-model="queryParams.handleTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择处理时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="解决时间" prop="resolvedTime">
+        <el-date-picker clearable
+          v-model="queryParams.resolvedTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择解决时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['base:machineAlarmRecords:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['base:machineAlarmRecords:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['base:machineAlarmRecords:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['base:machineAlarmRecords:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="machineAlarmRecordsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="报警记录ID" align="center" prop="id" />
+      <el-table-column label="农机ID" align="center" prop="machineId" />
+      <el-table-column label="报警类型" align="center" prop="alarmType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.machine_alarm_type" :value="scope.row.alarmType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="报警级别" align="center" prop="alarmLevel">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.machine_alarm_level" :value="scope.row.alarmLevel"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="报警描述" align="center" prop="alarmDesc" />
+      <el-table-column label="报警时间" align="center" prop="alarmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="报警位置信息" align="center" prop="locationInfo" />
+      <el-table-column label="处理状态" align="center" prop="handledStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.machine_handled_status" :value="scope.row.handledStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理人ID" align="center" prop="handlerId" />
+      <el-table-column label="处理人姓名" align="center" prop="handlerName" />
+      <el-table-column label="处理时间" align="center" prop="handleTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理描述" align="center" prop="handleDesc" />
+      <el-table-column label="解决时间" align="center" prop="resolvedTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.resolvedTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['base:machineAlarmRecords:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:machineAlarmRecords:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :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="农机ID" prop="machineId">
+          <el-input v-model="form.machineId" placeholder="请输入农机ID" />
+        </el-form-item>
+        <el-form-item label="报警类型" prop="alarmType">
+          <el-select v-model="form.alarmType" placeholder="请选择报警类型">
+            <el-option
+              v-for="dict in dict.type.machine_alarm_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="报警级别" prop="alarmLevel">
+          <el-select v-model="form.alarmLevel" placeholder="请选择报警级别">
+            <el-option
+              v-for="dict in dict.type.machine_alarm_level"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="报警描述" prop="alarmDesc">
+          <el-input v-model="form.alarmDesc" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="报警时间" prop="alarmTime">
+          <el-date-picker clearable
+            v-model="form.alarmTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择报警时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="报警位置信息" prop="locationInfo">
+          <el-input v-model="form.locationInfo" placeholder="请输入报警位置信息" />
+        </el-form-item>
+        <el-form-item label="处理状态" prop="handledStatus">
+          <el-radio-group v-model="form.handledStatus">
+            <el-radio
+              v-for="dict in dict.type.machine_handled_status"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="处理人ID" prop="handlerId">
+          <el-input v-model="form.handlerId" placeholder="请输入处理人ID" />
+        </el-form-item>
+        <el-form-item label="处理人姓名" prop="handlerName">
+          <el-input v-model="form.handlerName" placeholder="请输入处理人姓名" />
+        </el-form-item>
+        <el-form-item label="处理时间" prop="handleTime">
+          <el-date-picker clearable
+            v-model="form.handleTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择处理时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="处理描述" prop="handleDesc">
+          <el-input v-model="form.handleDesc" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="解决时间" prop="resolvedTime">
+          <el-date-picker clearable
+            v-model="form.resolvedTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择解决时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listMachineAlarmRecords, getMachineAlarmRecords, delMachineAlarmRecords, addMachineAlarmRecords, updateMachineAlarmRecords } from "@/api/base/machineAlarmRecords"
+
+export default {
+  name: "MachineAlarmRecords",
+  dicts: ['machine_alarm_level', 'machine_alarm_type', 'machine_handled_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 农机故障告警记录表格数据
+      machineAlarmRecordsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineId: null,
+        alarmType: null,
+        alarmLevel: null,
+        alarmDesc: null,
+        alarmTime: null,
+        locationInfo: null,
+        handledStatus: null,
+        handlerId: null,
+        handlerName: null,
+        handleTime: null,
+        handleDesc: null,
+        resolvedTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        machineId: [
+          { required: true, message: "农机ID不能为空", trigger: "blur" }
+        ],
+        alarmType: [
+          { required: true, message: "报警类型不能为空", trigger: "change" }
+        ],
+        alarmDesc: [
+          { required: true, message: "报警描述不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询农机故障告警记录列表 */
+    getList() {
+      this.loading = true
+      listMachineAlarmRecords(this.queryParams).then(response => {
+        this.machineAlarmRecordsList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        machineId: null,
+        alarmType: null,
+        alarmLevel: null,
+        alarmDesc: null,
+        alarmTime: null,
+        locationInfo: null,
+        handledStatus: null,
+        handlerId: null,
+        handlerName: null,
+        handleTime: null,
+        handleDesc: null,
+        resolvedTime: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加农机故障告警记录"
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getMachineAlarmRecords(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = "修改农机故障告警记录"
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMachineAlarmRecords(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addMachineAlarmRecords(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除农机故障告警记录编号为"' + ids + '"的数据项？').then(function() {
+        return delMachineAlarmRecords(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/machineAlarmRecords/export', {
+        ...this.queryParams
+      }, `machineAlarmRecords_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

src/views/base/machineWorkRecords/index.vue

@@ -0,0 +1,430 @@
+<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="农机ID" prop="machineId">
+        <el-input
+          v-model="queryParams.machineId"
+          placeholder="请输入农机ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="作业地块ID" prop="fieldId">
+        <el-input
+          v-model="queryParams.fieldId"
+          placeholder="请输入作业地块ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任务名称" prop="taskName">
+        <el-input
+          v-model="queryParams.taskName"
+          placeholder="请输入任务名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任务类型" prop="taskType">
+        <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable>
+          <el-option
+            v-for="dict in dict.type.machine_work_task_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker clearable
+          v-model="queryParams.startTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker clearable
+          v-model="queryParams.endTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="作业面积(亩)" prop="workArea">
+        <el-input
+          v-model="queryParams.workArea"
+          placeholder="请输入作业面积(亩)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="油耗(升)" prop="fuelConsumption">
+        <el-input
+          v-model="queryParams.fuelConsumption"
+          placeholder="请输入油耗(升)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="操作员ID" prop="operatorId">
+        <el-input
+          v-model="queryParams.operatorId"
+          placeholder="请输入操作员ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="记录状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择记录状态" clearable>
+          <el-option
+            v-for="dict in dict.type.machine_work_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['base:machineWorkRecords:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['base:machineWorkRecords:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['base:machineWorkRecords:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['base:machineWorkRecords:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="machineWorkRecordsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="工作记录ID" align="center" prop="id" />
+      <el-table-column label="农机ID" align="center" prop="machineId" />
+      <el-table-column label="作业地块ID" align="center" prop="fieldId" />
+      <el-table-column label="任务名称" align="center" prop="taskName" />
+      <el-table-column label="任务类型" align="center" prop="taskType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.machine_work_task_type" :value="scope.row.taskType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="作业面积(亩)" align="center" prop="workArea" />
+      <el-table-column label="油耗(升)" align="center" prop="fuelConsumption" />
+      <el-table-column label="操作员ID" align="center" prop="operatorId" />
+      <el-table-column label="记录状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.machine_work_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['base:machineWorkRecords:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:machineWorkRecords:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :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="农机ID" prop="machineId">
+          <el-input v-model="form.machineId" placeholder="请输入农机ID" />
+        </el-form-item>
+        <el-form-item label="作业地块ID" prop="fieldId">
+          <el-input v-model="form.fieldId" placeholder="请输入作业地块ID" />
+        </el-form-item>
+        <el-form-item label="任务名称" prop="taskName">
+          <el-input v-model="form.taskName" placeholder="请输入任务名称" />
+        </el-form-item>
+        <el-form-item label="任务类型" prop="taskType">
+          <el-select v-model="form.taskType" placeholder="请选择任务类型">
+            <el-option
+              v-for="dict in dict.type.machine_work_task_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker clearable
+            v-model="form.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="作业面积(亩)" prop="workArea">
+          <el-input v-model="form.workArea" placeholder="请输入作业面积(亩)" />
+        </el-form-item>
+        <el-form-item label="油耗(升)" prop="fuelConsumption">
+          <el-input v-model="form.fuelConsumption" placeholder="请输入油耗(升)" />
+        </el-form-item>
+        <el-form-item label="操作员ID" prop="operatorId">
+          <el-input v-model="form.operatorId" placeholder="请输入操作员ID" />
+        </el-form-item>
+        <el-form-item label="记录状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.machine_work_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listMachineWorkRecords, getMachineWorkRecords, delMachineWorkRecords, addMachineWorkRecords, updateMachineWorkRecords } from "@/api/base/machineWorkRecords"
+
+export default {
+  name: "MachineWorkRecords",
+  dicts: ['machine_work_task_type', 'machine_work_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 农机作业记录表格数据
+      machineWorkRecordsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineId: null,
+        fieldId: null,
+        taskName: null,
+        taskType: null,
+        startTime: null,
+        endTime: null,
+        workArea: null,
+        fuelConsumption: null,
+        operatorId: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        machineId: [
+          { required: true, message: "农机ID不能为空", trigger: "blur" }
+        ],
+        taskName: [
+          { required: true, message: "任务名称不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询农机作业记录列表 */
+    getList() {
+      this.loading = true
+      listMachineWorkRecords(this.queryParams).then(response => {
+        this.machineWorkRecordsList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        machineId: null,
+        fieldId: null,
+        taskName: null,
+        taskType: null,
+        startTime: null,
+        endTime: null,
+        workArea: null,
+        fuelConsumption: null,
+        operatorId: null,
+        status: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加农机作业记录"
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getMachineWorkRecords(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = "修改农机作业记录"
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMachineWorkRecords(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addMachineWorkRecords(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除农机作业记录编号为"' + ids + '"的数据项？').then(function() {
+        return delMachineWorkRecords(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/machineWorkRecords/export', {
+        ...this.queryParams
+      }, `machineWorkRecords_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>