ico更新+新增大棚管理等功能

src/api/assets/agri.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询大棚管理列表
+export function listAgri(query) {
+  return request({
+    url: '/assets/agri/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询大棚管理详细
+export function getAgri(id) {
+  return request({
+    url: '/assets/agri/' + id,
+    method: 'get'
+  })
+}
+
+// 新增大棚管理
+export function addAgri(data) {
+  return request({
+    url: '/assets/agri',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改大棚管理
+export function updateAgri(data) {
+  return request({
+    url: '/assets/agri',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除大棚管理
+export function delAgri(id) {
+  return request({
+    url: '/assets/agri/' + id,
+    method: 'delete'
+  })
+}

src/api/assets/alarm.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询告警方式设置列表
+export function listAlarm(query) {
+  return request({
+    url: '/assets/alarm/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询告警方式设置详细
+export function getAlarm(id) {
+  return request({
+    url: '/assets/alarm/' + id,
+    method: 'get'
+  })
+}
+
+// 新增告警方式设置
+export function addAlarm(data) {
+  return request({
+    url: '/assets/alarm',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改告警方式设置
+export function updateAlarm(data) {
+  return request({
+    url: '/assets/alarm',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除告警方式设置
+export function delAlarm(id) {
+  return request({
+    url: '/assets/alarm/' + id,
+    method: 'delete'
+  })
+}

src/api/assets/limit.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询执行时间限位管理列表
+export function listLimit(query) {
+  return request({
+    url: '/assets/limit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询执行时间限位管理详细
+export function getLimit(id) {
+  return request({
+    url: '/assets/limit/' + id,
+    method: 'get'
+  })
+}
+
+// 新增执行时间限位管理
+export function addLimit(data) {
+  return request({
+    url: '/assets/limit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改执行时间限位管理
+export function updateLimit(data) {
+  return request({
+    url: '/assets/limit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除执行时间限位管理
+export function delLimit(id) {
+  return request({
+    url: '/assets/limit/' + id,
+    method: 'delete'
+  })
+}

src/api/system/student.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询学生信息列表
+export function listStudent(query) {
+  return request({
+    url: '/system/student/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询学生信息详细
+export function getStudent(studentId) {
+  return request({
+    url: '/system/student/' + studentId,
+    method: 'get'
+  })
+}
+
+// 新增学生信息
+export function addStudent(data) {
+  return request({
+    url: '/system/student',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改学生信息
+export function updateStudent(data) {
+  return request({
+    url: '/system/student',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除学生信息
+export function delStudent(studentId) {
+  return request({
+    url: '/system/student/' + studentId,
+    method: 'delete'
+  })
+}
+
+// 导出学生信息
+export function exportStudent(query) {
+  return request({
+    url: '/system/student/export',
+    method: 'get',
+    params: query
+  })
+}

src/permission.js

@@ -18,6 +18,7 @@ const isWhiteList = (path) => {
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {
+    debugger;
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
     /* has token*/
     if (to.path === '/login') {

src/router/index.js

@@ -62,7 +62,7 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '',
+    path: '/',
     component: Layout,
     redirect: 'index',
     children: [

src/views/assets/agri/index.vue

@@ -0,0 +1,417 @@
+<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="设备IMEI" prop="imei">
+        <el-input
+          id="imei" v-model="queryParams.imei"
+          placeholder="请输入设备IMEI"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="大棚名称" prop="agriName">
+        <el-input
+          id="agriName" v-model="queryParams.agriName"
+          placeholder="请输入大棚名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="关联用户ID" prop="userId">
+        <el-input
+          id="userId" v-model="queryParams.userId"
+          placeholder="请输入关联用户ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="温度上限(℃)" prop="tempUpper">
+        <el-input-number
+            id="tempUpper" v-model="queryParams.tempUpper"
+        />
+      </el-form-item>
+      <el-form-item label="温度下限(℃)" prop="tempLower">
+        <el-input-number
+            id="tempLower" v-model="queryParams.tempLower"
+        />
+      </el-form-item>
+      <el-form-item label="湿度上限(%RH)" prop="humiUpper">
+        <el-input-number
+            id="humiUpper" v-model="queryParams.humiUpper"
+        />
+      </el-form-item>
+      <el-form-item label="湿度下限(%RH)" prop="humiLower">
+        <el-input-number
+            id="humiLower" v-model="queryParams.humiLower"
+        />
+      </el-form-item>
+      <el-form-item label="安装时间" prop="installTime">
+        <el-date-picker clearable
+          id="installTime" v-model="queryParams.installTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择安装时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="安装位置" prop="location">
+        <el-input
+          id="location" v-model="queryParams.location"
+          placeholder="请输入安装位置"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="逻辑删除(0-未删，1-已删)" prop="isDeleted">
+        <el-input
+          id="isDeleted" v-model="queryParams.isDeleted"
+          placeholder="请输入逻辑删除(0-未删，1-已删)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="['assets:agri: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="['assets:agri: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="['assets:agri: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="['assets:agri:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" border :data="agriList" @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="设备IMEI" align="center" prop="imei" />
+      <el-table-column label="大棚名称" align="center" prop="agriName" />
+      <el-table-column label="关联用户ID" align="center" prop="userId" />
+      <el-table-column label="温度上限(℃)" align="center" prop="tempUpper" />
+      <el-table-column label="温度下限(℃)" align="center" prop="tempLower" />
+      <el-table-column label="湿度上限(%RH)" align="center" prop="humiUpper" />
+      <el-table-column label="湿度下限(%RH)" align="center" prop="humiLower" />
+      <el-table-column label="告警开关(0-关闭，1-开启)" align="center" prop="alarmStatus" />
+      <el-table-column label="设备状态(0-离线，1-在线，2-故障)" align="center" prop="deviceStatus" />
+      <el-table-column label="安装时间" align="center" prop="installTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.installTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="安装位置" align="center" prop="location" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="逻辑删除(0-未删，1-已删)" align="center" prop="isDeleted" />
+      <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="['assets:agri:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['assets:agri: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="设备IMEI" prop="imei">
+          <el-input id="imei" v-model="form.imei" placeholder="请输入设备IMEI" />
+        </el-form-item>
+        <el-form-item label="大棚名称" prop="agriName">
+          <el-input id="agriName" v-model="form.agriName" placeholder="请输入大棚名称" />
+        </el-form-item>
+        <el-form-item label="关联用户ID" prop="userId">
+          <el-input id="userId" v-model="form.userId" placeholder="请输入关联用户ID" />
+        </el-form-item>
+        <el-form-item label="温度上限(℃)" prop="tempUpper">
+          <el-input-number v-model="form.tempUpper" id="tempUpper"/>
+        </el-form-item>
+        <el-form-item label="温度下限(℃)" prop="tempLower">
+          <el-input-number v-model="form.tempLower" id="tempLower"/>
+        </el-form-item>
+        <el-form-item label="湿度上限(%RH)" prop="humiUpper">
+          <el-input-number v-model="form.humiUpper" id="humiUpper"/>
+        </el-form-item>
+        <el-form-item label="湿度下限(%RH)" prop="humiLower">
+          <el-input-number v-model="form.humiLower" id="humiLower"/>
+        </el-form-item>
+        <el-form-item label="安装时间" prop="installTime">
+          <el-date-picker clearable
+            id="installTime" v-model="form.installTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择安装时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="安装位置" prop="location">
+          <el-input id="location" v-model="form.location" placeholder="请输入安装位置" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input id="remark" v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="逻辑删除(0-未删，1-已删)" prop="isDeleted">
+          <el-input id="isDeleted" v-model="form.isDeleted" placeholder="请输入逻辑删除(0-未删，1-已删)" />
+        </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 { listAgri, getAgri, delAgri, addAgri, updateAgri } from "@/api/assets/agri"
+
+export default {
+  name: "Agri",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 大棚管理表格数据
+      agriList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        imei: null,
+        agriName: null,
+        userId: null,
+        tempUpper: null,
+        tempLower: null,
+        humiUpper: null,
+        humiLower: null,
+        alarmStatus: null,
+        deviceStatus: null,
+        installTime: null,
+        location: null,
+        isDeleted: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        imei: [
+          { required: true, message: "设备IMEI不能为空", trigger: "blur" }
+        ],
+        agriName: [
+          { required: true, message: "大棚名称不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "关联用户ID不能为空", trigger: "blur" }
+        ],
+        alarmStatus: [
+          { required: true, message: "告警开关(0-关闭，1-开启)不能为空", trigger: "change" }
+        ],
+        deviceStatus: [
+          { required: true, message: "设备状态(0-离线，1-在线，2-故障)不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        createBy: [
+          { required: true, message: "创建人ID不能为空", trigger: "blur" }
+        ],
+        updateTime: [
+          { required: true, message: "修改时间不能为空", trigger: "blur" }
+        ],
+        updateBy: [
+          { required: true, message: "修改人ID不能为空", trigger: "blur" }
+        ],
+        isDeleted: [
+          { required: true, message: "逻辑删除(0-未删，1-已删)不能为空", trigger: "blur" }
+        ]
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询大棚管理列表 */
+    getList() {
+      this.loading = true
+      listAgri(this.queryParams).then(response => {
+        this.agriList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        imei: null,
+        agriName: null,
+        userId: null,
+        tempUpper: null,
+        tempLower: null,
+        humiUpper: null,
+        humiLower: null,
+        alarmStatus: null,
+        deviceStatus: null,
+        installTime: null,
+        location: null,
+        remark: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        isDeleted: 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
+      getAgri(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) {
+            updateAgri(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addAgri(this.form).then(response => {
+                if (response.code===200) {
+                  this.$modal.msgSuccess("新增成功")
+                } else {
+                  this.$modal.msgError("新增失败")
+                }
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除大棚管理编号为"' + ids + '"的数据项？').then(function() {
+        return delAgri(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('assets/agri/export', {
+        ...this.queryParams
+      }, `agri_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

src/views/assets/alarm/index.vue

@@ -0,0 +1,330 @@
+<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="agriId">
+        <el-input
+          id="agriId" v-model="queryParams.agriId"
+          placeholder="请输入关联大棚设备表ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="imei" prop="imei">
+        <el-input
+          id="imei" v-model="queryParams.imei"
+          placeholder="请输入imei"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="告警方式编码" prop="typeCode">
+        <el-input
+          id="typeCode" v-model="queryParams.typeCode"
+          placeholder="请输入告警方式编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="逻辑删除(0-未删，1-已删)" prop="isDeleted">
+        <el-input
+          id="isDeleted" v-model="queryParams.isDeleted"
+          placeholder="请输入逻辑删除(0-未删，1-已删)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="大棚名称" prop="agriName">
+        <el-input
+          id="agriName" v-model="queryParams.agriName"
+          placeholder="请输入大棚名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="['assets:alarm: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="['assets:alarm: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="['assets:alarm: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="['assets:alarm:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" border :data="alarmList" @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="agriId" />
+      <el-table-column label="imei" align="center" prop="imei" />
+      <el-table-column label="告警方式编码" align="center" prop="typeCode" />
+      <el-table-column label="逻辑删除(0-未删，1-已删)" align="center" prop="isDeleted" />
+      <el-table-column label="大棚名称" align="center" prop="agriName" />
+      <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="['assets:alarm:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['assets:alarm: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="agriId">
+          <el-input id="agriId" v-model="form.agriId" placeholder="请输入关联大棚设备表ID" />
+        </el-form-item>
+        <el-form-item label="imei" prop="imei">
+          <el-input id="imei" v-model="form.imei" placeholder="请输入imei" />
+        </el-form-item>
+        <el-form-item label="告警方式编码" prop="typeCode">
+          <el-input id="typeCode" v-model="form.typeCode" placeholder="请输入告警方式编码" />
+        </el-form-item>
+        <el-form-item label="逻辑删除(0-未删，1-已删)" prop="isDeleted">
+          <el-input id="isDeleted" v-model="form.isDeleted" placeholder="请输入逻辑删除(0-未删，1-已删)" />
+        </el-form-item>
+        <el-form-item label="大棚名称" prop="agriName">
+          <el-input id="agriName" v-model="form.agriName" 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 { listAlarm, getAlarm, delAlarm, addAlarm, updateAlarm } from "@/api/assets/alarm"
+
+export default {
+  name: "Alarm",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 告警方式设置表格数据
+      alarmList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        agriId: null,
+        imei: null,
+        typeCode: null,
+        isDeleted: null,
+        agriName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        agriId: [
+          { required: true, message: "关联大棚设备表ID不能为空", trigger: "blur" }
+        ],
+        imei: [
+          { required: true, message: "imei不能为空", trigger: "blur" }
+        ],
+        typeCode: [
+          { required: true, message: "告警方式编码不能为空", trigger: "blur" }
+        ],
+        createBy: [
+          { required: true, message: "创建人ID不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        isDeleted: [
+          { required: true, message: "逻辑删除(0-未删，1-已删)不能为空", trigger: "blur" }
+        ],
+        agriName: [
+          { required: true, message: "大棚名称不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询告警方式设置列表 */
+    getList() {
+      this.loading = true
+      listAlarm(this.queryParams).then(response => {
+        this.alarmList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        agriId: null,
+        imei: null,
+        typeCode: null,
+        createBy: null,
+        createTime: null,
+        isDeleted: null,
+        agriName: null,
+        updateBy: null,
+        updateTime: 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
+      getAlarm(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) {
+            updateAlarm(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addAlarm(this.form).then(response => {
+                if (response.code===200) {
+                  this.$modal.msgSuccess("新增成功")
+                } else {
+                  this.$modal.msgError("新增失败")
+                }
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除告警方式设置编号为"' + ids + '"的数据项？').then(function() {
+        return delAlarm(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('assets/alarm/export', {
+        ...this.queryParams
+      }, `alarm_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

src/views/assets/limit/index.vue

@@ -0,0 +1,428 @@
+<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="agriId">
+        <el-input
+          id="agriId" v-model="queryParams.agriId"
+          placeholder="请输入大棚ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="大棚名称" prop="agriName">
+        <el-input
+          id="agriName" v-model="queryParams.agriName"
+          placeholder="请输入大棚名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="imei" prop="imei">
+        <el-input
+          id="imei" v-model="queryParams.imei"
+          placeholder="请输入imei"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="卷被开限位时间(秒)" prop="jbkLimit">
+        <el-input-number
+            id="jbkLimit" v-model="queryParams.jbkLimit"
+        />
+      </el-form-item>
+      <el-form-item label="卷被关限位时间(秒)" prop="jbgLimit">
+        <el-input-number
+            id="jbgLimit" v-model="queryParams.jbgLimit"
+        />
+      </el-form-item>
+      <el-form-item label="卷膜1开限位时间(秒)" prop="jm1kLimit">
+        <el-input-number
+            id="jm1kLimit" v-model="queryParams.jm1kLimit"
+        />
+      </el-form-item>
+      <el-form-item label="卷膜1关限位时间(秒)" prop="jm1gLimit">
+        <el-input-number
+            id="jm1gLimit" v-model="queryParams.jm1gLimit"
+        />
+      </el-form-item>
+      <el-form-item label="卷膜2开限位时间(秒)" prop="jm2kLimit">
+        <el-input-number
+            id="jm2kLimit" v-model="queryParams.jm2kLimit"
+        />
+      </el-form-item>
+      <el-form-item label="卷膜2关限位时间(秒)" prop="jm2gLimit">
+        <el-input-number
+            id="jm2gLimit" v-model="queryParams.jm2gLimit"
+        />
+      </el-form-item>
+      <el-form-item label="卷膜3开限位时间(秒)" prop="jm3kLimit">
+        <el-input-number
+            id="jm3kLimit" v-model="queryParams.jm3kLimit"
+        />
+      </el-form-item>
+      <el-form-item label="卷膜3关限位时间(秒)" prop="jm3gLimit">
+        <el-input-number
+            id="jm3gLimit" v-model="queryParams.jm3gLimit"
+        />
+      </el-form-item>
+      <el-form-item label="修改人ID" prop="updateBy">
+        <el-input
+          id="updateBy" v-model="queryParams.updateBy"
+          placeholder="请输入修改人ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="删除时间" prop="deleteTime">
+        <el-date-picker clearable
+          id="deleteTime" v-model="queryParams.deleteTime"
+          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="['assets:limit: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="['assets:limit: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="['assets:limit: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="['assets:limit:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" border :data="limitList" @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="agriId" />
+      <el-table-column label="大棚名称" align="center" prop="agriName" />
+      <el-table-column label="imei" align="center" prop="imei" />
+      <el-table-column label="卷被开限位时间(秒)" align="center" prop="jbkLimit" />
+      <el-table-column label="卷被关限位时间(秒)" align="center" prop="jbgLimit" />
+      <el-table-column label="卷膜1开限位时间(秒)" align="center" prop="jm1kLimit" />
+      <el-table-column label="卷膜1关限位时间(秒)" align="center" prop="jm1gLimit" />
+      <el-table-column label="卷膜2开限位时间(秒)" align="center" prop="jm2kLimit" />
+      <el-table-column label="卷膜2关限位时间(秒)" align="center" prop="jm2gLimit" />
+      <el-table-column label="卷膜3开限位时间(秒)" align="center" prop="jm3kLimit" />
+      <el-table-column label="卷膜3关限位时间(秒)" align="center" prop="jm3gLimit" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="数据版本号" align="center" prop="version" />
+      <el-table-column label="修改人ID" align="center" prop="updateBy" />
+      <el-table-column label="删除标识：0-未删 1-已删" align="center" prop="deleted" />
+      <el-table-column label="删除时间" align="center" prop="deleteTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deleteTime, '{y}-{m}-{d}') }}</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="['assets:limit:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['assets:limit: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="agriId">
+          <el-input id="agriId" v-model="form.agriId" placeholder="请输入大棚ID" />
+        </el-form-item>
+        <el-form-item label="大棚名称" prop="agriName">
+          <el-input id="agriName" v-model="form.agriName" placeholder="请输入大棚名称" />
+        </el-form-item>
+        <el-form-item label="imei" prop="imei">
+          <el-input id="imei" v-model="form.imei" placeholder="请输入imei" />
+        </el-form-item>
+        <el-form-item label="卷被开限位时间(秒)" prop="jbkLimit">
+          <el-input-number v-model="form.jbkLimit" id="jbkLimit"/>
+        </el-form-item>
+        <el-form-item label="卷被关限位时间(秒)" prop="jbgLimit">
+          <el-input-number v-model="form.jbgLimit" id="jbgLimit"/>
+        </el-form-item>
+        <el-form-item label="卷膜1开限位时间(秒)" prop="jm1kLimit">
+          <el-input-number v-model="form.jm1kLimit" id="jm1kLimit"/>
+        </el-form-item>
+        <el-form-item label="卷膜1关限位时间(秒)" prop="jm1gLimit">
+          <el-input-number v-model="form.jm1gLimit" id="jm1gLimit"/>
+        </el-form-item>
+        <el-form-item label="卷膜2开限位时间(秒)" prop="jm2kLimit">
+          <el-input-number v-model="form.jm2kLimit" id="jm2kLimit"/>
+        </el-form-item>
+        <el-form-item label="卷膜2关限位时间(秒)" prop="jm2gLimit">
+          <el-input-number v-model="form.jm2gLimit" id="jm2gLimit"/>
+        </el-form-item>
+        <el-form-item label="卷膜3开限位时间(秒)" prop="jm3kLimit">
+          <el-input-number v-model="form.jm3kLimit" id="jm3kLimit"/>
+        </el-form-item>
+        <el-form-item label="卷膜3关限位时间(秒)" prop="jm3gLimit">
+          <el-input-number v-model="form.jm3gLimit" id="jm3gLimit"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input id="remark" v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="修改人ID" prop="updateBy">
+          <el-input id="updateBy" v-model="form.updateBy" placeholder="请输入修改人ID" />
+        </el-form-item>
+        <el-form-item label="删除时间" prop="deleteTime">
+          <el-date-picker clearable
+            id="deleteTime" v-model="form.deleteTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择删除时间">
+          </el-date-picker>
+        </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 { listLimit, getLimit, delLimit, addLimit, updateLimit } from "@/api/assets/limit"
+
+export default {
+  name: "Limit",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 执行时间限位管理表格数据
+      limitList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        agriId: null,
+        agriName: null,
+        imei: null,
+        jbkLimit: null,
+        jbgLimit: null,
+        jm1kLimit: null,
+        jm1gLimit: null,
+        jm2kLimit: null,
+        jm2gLimit: null,
+        jm3kLimit: null,
+        jm3gLimit: null,
+        version: null,
+        updateBy: null,
+        deleted: null,
+        deleteTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        agriId: [
+          { required: true, message: "大棚ID不能为空", trigger: "blur" }
+        ],
+        imei: [
+          { required: true, message: "imei不能为空", trigger: "blur" }
+        ],
+        createBy: [
+          { required: true, message: "创建人姓名不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询执行时间限位管理列表 */
+    getList() {
+      this.loading = true
+      listLimit(this.queryParams).then(response => {
+        this.limitList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        agriId: null,
+        agriName: null,
+        imei: null,
+        jbkLimit: null,
+        jbgLimit: null,
+        jm1kLimit: null,
+        jm1gLimit: null,
+        jm2kLimit: null,
+        jm2gLimit: null,
+        jm3kLimit: null,
+        jm3gLimit: null,
+        remark: null,
+        version: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deleted: null,
+        deleteTime: 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
+      getLimit(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) {
+            updateLimit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addLimit(this.form).then(response => {
+                if (response.code===200) {
+                  this.$modal.msgSuccess("新增成功")
+                } else {
+                  this.$modal.msgError("新增失败")
+                }
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除执行时间限位管理编号为"' + ids + '"的数据项？').then(function() {
+        return delLimit(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('assets/limit/export', {
+        ...this.queryParams
+      }, `limit_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

src/views/system/student/index.vue

@@ -0,0 +1,338 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="学生名称" prop="studentName">
+        <el-input
+          v-model="queryParams.studentName"
+          placeholder="请输入学生名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年龄" prop="studentAge">
+        <el-input
+          v-model="queryParams.studentAge"
+          placeholder="请输入年龄"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="爱好" prop="studentHobby">
+        <el-input
+          v-model="queryParams.studentHobby"
+          placeholder="请输入爱好"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="性别" prop="studentSex">
+        <el-select v-model="queryParams.studentSex" placeholder="请选择性别" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="studentStatus">
+        <el-select v-model="queryParams.studentStatus" placeholder="请选择状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="生日" prop="studentBirthday">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.studentBirthday"
+                        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="['system:student: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="['system:student: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="['system:student: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="['system:student:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="studentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="studentId" />
+      <el-table-column label="学生名称" align="center" prop="studentName" />
+      <el-table-column label="年龄" align="center" prop="studentAge" />
+      <el-table-column label="爱好" align="center" prop="studentHobby" />
+      <el-table-column label="性别" align="center" prop="studentSex" />
+      <el-table-column label="状态" align="center" prop="studentStatus" />
+      <el-table-column label="生日" align="center" prop="studentBirthday" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.studentBirthday, '{y}-{m}-{d}') }}</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="['system:student:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:student: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="学生名称" prop="studentName">
+          <el-input v-model="form.studentName" placeholder="请输入学生名称" />
+        </el-form-item>
+        <el-form-item label="年龄" prop="studentAge">
+          <el-input v-model="form.studentAge" placeholder="请输入年龄" />
+        </el-form-item>
+        <el-form-item label="爱好" prop="studentHobby">
+          <el-input v-model="form.studentHobby" placeholder="请输入爱好" />
+        </el-form-item>
+        <el-form-item label="性别" prop="studentSex">
+          <el-select v-model="form.studentSex" placeholder="请选择性别">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.studentStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="生日" prop="studentBirthday">
+          <el-date-picker clearable size="small"
+                          v-model="form.studentBirthday"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择生日">
+          </el-date-picker>
+        </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 { listStudent, getStudent, delStudent, addStudent, updateStudent, exportStudent } from "@/api/system/student";
+
+export default {
+  name: "Student",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 学生信息表格数据
+      studentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        studentName: null,
+        studentAge: null,
+        studentHobby: null,
+        studentSex: null,
+        studentStatus: null,
+        studentBirthday: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询学生信息列表 */
+    getList() {
+      this.loading = true;
+      listStudent(this.queryParams).then(response => {
+        this.studentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        studentId: null,
+        studentName: null,
+        studentAge: null,
+        studentHobby: null,
+        studentSex: null,
+        studentStatus: "0",
+        studentBirthday: 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.studentId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加学生信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const studentId = row.studentId || this.ids
+      getStudent(studentId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改学生信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.studentId != null) {
+            updateStudent(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStudent(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const studentIds = row.studentId || this.ids;
+      this.$confirm('是否确认删除学生信息编号为"' + studentIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delStudent(studentIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有学生信息数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportStudent(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    }
+  }
+};
+</script>

src/views/tool/gen/editTable.vue

@@ -5,7 +5,7 @@
         <basic-info-form ref="basicInfo" :info="info" />
       </el-tab-pane>
       <el-tab-pane label="字段信息" name="columnInfo">
-        <el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
+        <el-table ref="dragTable" :data="columns" row-key="columnId" border :max-height="tableHeight">
           <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag"/>
           <el-table-column label="字段列名" prop="columnName" min-width="10%" :show-overflow-tooltip="true" class-name="allowDrag"/>
           <el-table-column label="字段描述" min-width="10%">
@@ -81,6 +81,7 @@
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">
                 <el-option label="文本框" value="input" />
+                <el-option label="计数器" value="number" />
                 <el-option label="文本域" value="textarea" />
                 <el-option label="下拉框" value="select" />
                 <el-option label="单选框" value="radio" />