20200525-zlp-1
培训
This commit is contained in:
@ -63,6 +63,7 @@
|
||||
"screenfull": "4.2.0",
|
||||
"sortablejs": "1.8.4",
|
||||
"v-distpicker": "^1.2.2",
|
||||
"video.js": "^7.7.6",
|
||||
"vue": "2.6.10",
|
||||
"vue-count-to": "1.0.13",
|
||||
"vue-cropper": "0.4.9",
|
||||
|
@ -21,6 +21,9 @@ import { getConfigKey } from "@/api/system/config";
|
||||
import { parseTime, resetForm, addDateRange, selectDictLabel, download, handleTree } from "@/utils/ruoyi";
|
||||
import Pagination from "@/components/Pagination";
|
||||
|
||||
import Video from 'video.js'
|
||||
import 'video.js/dist/video-js.css'
|
||||
|
||||
// 全局方法挂载
|
||||
Vue.prototype.getDicts = getDicts
|
||||
Vue.prototype.getConfigKey = getConfigKey
|
||||
@ -31,6 +34,8 @@ Vue.prototype.selectDictLabel = selectDictLabel
|
||||
Vue.prototype.download = download
|
||||
Vue.prototype.handleTree = handleTree
|
||||
|
||||
Vue.prototype.$video = Video
|
||||
|
||||
Vue.prototype.msgSuccess = function (msg) {
|
||||
this.$message({ showClose: true, message: msg, type: "success" });
|
||||
}
|
||||
|
@ -90,30 +90,30 @@ export const constantRoutes = [{
|
||||
meta: { title: '字典数据', icon: '' }
|
||||
}]
|
||||
},
|
||||
{
|
||||
path: '/dayflow',
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
children: [{
|
||||
path: 'dayflowmanger/dayflowtask/:id(\\d+)',
|
||||
component: () =>
|
||||
import ('@/views/benyi/dayflow/task'),
|
||||
name: 'Task',
|
||||
meta: { title: '一日流程任务', icon: '' }
|
||||
}]
|
||||
},
|
||||
{
|
||||
path: '/dayflow',
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
children: [{
|
||||
path: 'dayflowmanger/dayflowtask/standard/:code(\\d+)',
|
||||
component: () =>
|
||||
import ('@/views/benyi/dayflow/standard'),
|
||||
name: 'Standard',
|
||||
meta: { title: '一日流程标准', icon: '' }
|
||||
}]
|
||||
},
|
||||
// {
|
||||
// path: '/dayflow',
|
||||
// component: Layout,
|
||||
// hidden: true,
|
||||
// children: [{
|
||||
// path: 'dayflowmanger/dayflowtask/:id(\\d+)',
|
||||
// component: () =>
|
||||
// import ('@/views/benyi/dayflow/task'),
|
||||
// name: 'Task',
|
||||
// meta: { title: '一日流程任务', icon: '' }
|
||||
// }]
|
||||
// },
|
||||
// {
|
||||
// path: '/dayflow',
|
||||
// component: Layout,
|
||||
// hidden: true,
|
||||
// children: [{
|
||||
// path: 'dayflowmanger/dayflowtask/standard/:code(\\d+)',
|
||||
// component: () =>
|
||||
// import ('@/views/benyi/dayflow/standard'),
|
||||
// name: 'Standard',
|
||||
// meta: { title: '一日流程标准', icon: '' }
|
||||
// }]
|
||||
// },
|
||||
{
|
||||
path: '/job',
|
||||
component: Layout,
|
||||
|
@ -18,11 +18,11 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="32">
|
||||
<el-calendar v-model="value" id="calendar">
|
||||
<!-- <el-calendar v-model="value" id="calendar">-->
|
||||
<!-- 这里使用的是 2.5 slot 语法,对于新项目请使用 2.6 slot 语法-->
|
||||
<template slot="dateCell" slot-scope="{date, data}">
|
||||
<!--<template slot="dateCell" slot-scope="{date, data}">-->
|
||||
<!--自定义内容-->
|
||||
<div>
|
||||
<!--<div>
|
||||
<div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
|
||||
<div v-for="(item,index) in calendarData" :key="index">
|
||||
<div v-if="(item.years).indexOf(data.day.split('-').slice(0)[0])!=-1">
|
||||
@ -40,7 +40,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-calendar>
|
||||
</el-calendar> -->
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
@ -49,7 +49,7 @@
|
||||
import RaddarChart from "./dashboard/RaddarChart";
|
||||
import PieChart from "./dashboard/PieChart";
|
||||
import BarChart from "./dashboard/BarChart";
|
||||
import { getSchoolCalendars } from "@/api/benyi/schoolcalendar";
|
||||
//import { getSchoolCalendars } from "@/api/benyi/schoolcalendar";
|
||||
//备用进行班级园历显示操作import { getSchoolCalendarsClass } from "@/api/benyi/schoolcalendarclass";
|
||||
|
||||
export default {
|
||||
@ -69,15 +69,15 @@ export default {
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getSchoolCalendarList();
|
||||
//this.getSchoolCalendarList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询园历列表 */
|
||||
getSchoolCalendarList() {
|
||||
getSchoolCalendars(this.queryParams).then(response => {
|
||||
this.calendarData = response.calendarData;
|
||||
});
|
||||
}
|
||||
// getSchoolCalendarList() {
|
||||
// getSchoolCalendars(this.queryParams).then(response => {
|
||||
// this.calendarData = response.calendarData;
|
||||
// });
|
||||
// }
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
Reference in New Issue
Block a user