diff --git a/ruoyi-ui/src/api/benyi/schoolcalendar.js b/ruoyi-ui/src/api/benyi/schoolcalendar.js
new file mode 100644
index 000000000..f93534fbc
--- /dev/null
+++ b/ruoyi-ui/src/api/benyi/schoolcalendar.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询园历管理列表
+export function listSchoolcalendar(query) {
+  return request({
+    url: '/benyi/schoolcalendar/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询园历管理详细
+export function getSchoolcalendar(id) {
+  return request({
+    url: '/benyi/schoolcalendar/' + id,
+    method: 'get'
+  })
+}
+
+// 新增园历管理
+export function addSchoolcalendar(data) {
+  return request({
+    url: '/benyi/schoolcalendar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改园历管理
+export function updateSchoolcalendar(data) {
+  return request({
+    url: '/benyi/schoolcalendar',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除园历管理
+export function delSchoolcalendar(id) {
+  return request({
+    url: '/benyi/schoolcalendar/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出园历管理
+export function exportSchoolcalendar(query) {
+  return request({
+    url: '/benyi/schoolcalendar/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue b/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
new file mode 100644
index 000000000..20f3a22a1
--- /dev/null
+++ b/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
@@ -0,0 +1,418 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="活动类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择活动类型" clearable size="small">
+          <el-option
+            v-for="dict in schoolcalendartypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="适用范围" prop="scope">
+        <el-select v-model="queryParams.scope" placeholder="请选择适用范围" clearable size="small">
+          <el-option
+            v-for="dict in scopeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="学年学期" prop="xnxq">
+        <el-select v-model="queryParams.xnxq" placeholder="请选择学年学期" clearable size="small">
+          <el-option
+            v-for="dict in xnxqOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="活动时间" prop="activitytime">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-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"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['benyi:schoolcalendar:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['benyi:schoolcalendar:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['benyi:schoolcalendar:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['benyi:schoolcalendar:export']"
+        >导出</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="schoolcalendarList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标识" align="center" prop="id" />
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column
+        label="活动类型"
+        align="center"
+        :formatter="schoolcalendartypeFormat"
+        prop="type"
+      />
+      <el-table-column label="适用范围" align="center" :formatter="scopeFormat" prop="scope" />
+      <el-table-column label="学年学期" align="center" :formatter="xnxqFormat" prop="xnxq" />
+      <el-table-column label="活动时间" align="center" prop="activitytime" width="180" />
+      <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="['benyi:schoolcalendar:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['benyi:schoolcalendar: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">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="活动类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择活动类型" clearable size="small">
+            <el-option
+              v-for="dict in schoolcalendartypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="适用范围" prop="scope">
+          <el-select v-model="form.scope" multiple placeholder="请选择适用范围" clearable size="small">
+            <el-option
+              v-for="dict in scopeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="活动时间" prop="activitytime">
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 200px"
+            v-model="form.activitytime"
+            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 {
+  listSchoolcalendar,
+  getSchoolcalendar,
+  delSchoolcalendar,
+  addSchoolcalendar,
+  updateSchoolcalendar,
+  exportSchoolcalendar
+} from "@/api/benyi/schoolcalendar";
+
+export default {
+  name: "Schoolcalendar",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 园历管理表格数据
+      schoolcalendarList: [],
+      // 弹出层标题
+      title: "",
+      // 日期范围
+      dateRange: [],
+      // 是否显示弹出层
+      open: false,
+      //园历类型
+      schoolcalendartypeOptions: [],
+      //园历适用范围
+      scopeOptions: [],
+      //学年学期
+      xnxqOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        type: undefined,
+        scope: undefined,
+        xnxq: undefined,
+        deptid: undefined,
+        activitytime: undefined,
+        createuserid: undefined,
+        createtime: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        type: [
+          { required: true, message: "活动类型不能为空", trigger: "blur" }
+        ],
+        scope: [
+          { required: true, message: "活动范围不能为空", trigger: "blur" }
+        ],
+        activitytime: [
+          { required: true, message: "活动时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_schoolcalendartype").then(response => {
+      this.schoolcalendartypeOptions = response.data;
+    });
+    this.getDicts("sys_yebjlx").then(response => {
+      this.scopeOptions = response.data;
+    });
+    this.getDicts("sys_xnxq").then(response => {
+      this.xnxqOptions = response.data;
+    });
+  },
+  methods: {
+    // 学校园历类型--字典状态字典翻译
+    schoolcalendartypeFormat(row, column) {
+      return this.selectDictLabel(this.schoolcalendartypeOptions, row.type);
+    },
+    // 适用范围类型--字典状态字典翻译
+    scopeFormat(row, column) {
+      //alert(row.scope.split(';').length);
+      var ilength = row.scope.split(";").length;
+      var names = "";
+      for (var i = 0; i < ilength; i++) {
+        names =
+          names +
+          this.selectDictLabel(this.scopeOptions, row.scope.split(";")[i]) +
+          ";";
+      }
+      //this.selectDictLabel(this.scopeOptions, row.xnxq);
+      return names;
+    },
+    // 学年学期类型--字典状态字典翻译
+    xnxqFormat(row, column) {
+      return this.selectDictLabel(this.xnxqOptions, row.xnxq);
+    },
+    /** 查询园历管理列表 */
+    getList() {
+      this.loading = true;
+      listSchoolcalendar(this.queryParams).then(response => {
+        this.schoolcalendarList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        type: undefined,
+        scope: undefined,
+        activitytime: undefined
+      };
+      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;
+      getSchoolcalendar(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改园历管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          var arrscope = this.form.scope;
+          this.form.scope = arrscope.join(";");
+          if (this.form.id != undefined) {
+            updateSchoolcalendar(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              } else {
+                this.msgError(response.msg);
+              }
+            });
+          } else {
+            addSchoolcalendar(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              } else {
+                this.msgError(response.msg);
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(
+        '是否确认删除园历管理编号为"' + ids + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      )
+        .then(function() {
+          return delSchoolcalendar(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有园历管理数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(function() {
+          return exportSchoolcalendar(queryParams);
+        })
+        .then(response => {
+          this.download(response.msg);
+        })
+        .catch(function() {});
+    }
+  }
+};
+</script>
\ No newline at end of file