From 1c64fa8140ff9e2a94f2c1aa8c65f227b3f355af Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Wed, 9 Sep 2020 14:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E8=AE=A1=E5=88=92=E5=92=8C=E8=AF=A6?=
=?UTF-8?q?=E7=BB=86=20=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/router/index.js | 761 ++++++++++----------
ruoyi-ui/src/views/benyi/planweek/data.vue | 20 +-
ruoyi-ui/src/views/benyi/planweek/index.vue | 54 +-
ruoyi-ui/src/views/benyi/planweek/table.vue | 248 +++----
4 files changed, 520 insertions(+), 563 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index d340a0e06..5e8945bbd 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -26,381 +26,396 @@ import Layout from '@/layout'
// 公共路由
export const constantRoutes = [{
- path: '/redirect',
- component: Layout,
- hidden: true,
- children: [{
- path: '/redirect/:path(.*)',
- component: () =>
- import('@/views/redirect')
- }]
- },
- {
- path: '/login',
- component: () =>
- import('@/views/login'),
- hidden: true
- },
- {
- path: '/404',
- component: () =>
- import('@/views/error/404'),
- hidden: true
- },
- {
- path: '/401',
- component: () =>
- import('@/views/error/401'),
- hidden: true
- },
- {
- path: '/experience/content/:id',
- component: () =>
- import('@/views/benyi/experience/content'),
- hidden: true
- },
- {
- path: '/activity',
- component: () =>
- import('@/views/benyi/activity'),
- hidden: true
- },
- {
- path: '/week',
- component: () =>
- import('@/views/benyi/themeweekplan/table'),
- hidden: true
- },
- {
- path: '/month',
- component: () =>
- import('@/views/benyi/thememonthplan/table'),
- hidden: true
- },
- {
- path: '/term',
- component: () =>
- import('@/views/benyi/themetermplan/table'),
- hidden: true
- },
- {
- path: '/play',
- component: () =>
- import('@/views/benyi/planweek/table'),
- hidden: true
- },
- {
- path: '/experience/apply/:id(\\d+)',
- component: () =>
- import('@/views/benyi/experience/choose'),
- hidden: true,
- children: [{
+ path: '/redirect',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: '/redirect/:path(.*)',
+ component: () =>
+ import ('@/views/redirect')
+ }]
+ },
+ {
+ path: '/login',
+ component: () =>
+ import ('@/views/login'),
+ hidden: true
+ },
+ {
+ path: '/404',
+ component: () =>
+ import ('@/views/error/404'),
+ hidden: true
+ },
+ {
+ path: '/401',
+ component: () =>
+ import ('@/views/error/401'),
+ hidden: true
+ },
+ {
+ path: '/experience/content/:id',
+ component: () =>
+ import ('@/views/benyi/experience/content'),
+ hidden: true
+ },
+ {
+ path: '/activity',
+ component: () =>
+ import ('@/views/benyi/activity'),
+ hidden: true
+ },
+ {
+ path: '/week',
+ component: () =>
+ import ('@/views/benyi/themeweekplan/table'),
+ hidden: true
+ },
+ {
+ path: '/month',
+ component: () =>
+ import ('@/views/benyi/thememonthplan/table'),
+ hidden: true
+ },
+ {
+ path: '/term',
+ component: () =>
+ import ('@/views/benyi/themetermplan/table'),
+ hidden: true
+ },
+ {
+ path: '/play',
+ component: () =>
+ import ('@/views/benyi/planweek/table'),
+ hidden: true
+ },
+ {
path: '/experience/apply/:id(\\d+)',
component: () =>
- import('@/views/benyi/experience/apply'),
- hidden: true
- },
- {
- path: '/experience/result/:id(\\d+)',
- component: () =>
- import('@/views/benyi/experience/result'),
- hidden: true
- }
- ]
- },
- {
- path: '',
- component: Layout,
- redirect: 'index',
- children: [{
- path: 'index',
- component: () =>
- import('@/views/index'),
- name: '首页',
- meta: {
- title: '首页',
- icon: 'dashboard',
- noCache: true,
- affix: true
- }
- }]
- },
- {
- path: '/user',
- component: Layout,
- hidden: true,
- redirect: 'noredirect',
- children: [{
- path: 'profile',
- component: () =>
- import('@/views/system/user/profile/index'),
- name: 'Profile',
- meta: {
- title: '个人中心',
- icon: 'user'
- }
- }]
- },
- {
- path: '/user/change',
- component: Layout,
- hidden: true,
- redirect: 'noredirect',
- children: [{
- path: 'dept',
- component: () =>
- import('@/views/system/user/change/dept/index'),
- name: 'Changedept',
- meta: {
- title: '切换岗位',
- icon: 'user'
- }
- }]
- },
- {
- path: '/dict',
- component: Layout,
- hidden: true,
- children: [{
- path: 'type/data/:dictId(\\d+)',
- component: () =>
- import('@/views/system/dict/data'),
- name: 'Data',
- 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/dayflowmanger',
- component: Layout,
- hidden: true,
- children: [{
- path: 'dayflowtask/standard/:code(\\d+)',
- component: () =>
- import('@/views/benyi/dayflow/standard'),
- name: 'Standard',
- meta: {
- title: '一日流程标准',
- icon: ''
- }
- }]
- },
- {
- path: '/dayflow/dayflowmanger/dayflowtask',
- component: Layout,
- hidden: true,
- children: [{
- path: 'standard/unscramble/:id(\\d+)',
- component: () =>
- import('@/views/benyi/dayflow/unscramble'),
- name: 'unscramble',
- meta: {
- title: '一日流程标准解读',
- icon: ''
- }
- }]
- },
- {
- path: '/video_study',
- component: Layout,
- hidden: true,
- children: [{
- path: 'study/detail/:id(\\d+)',
- component: () =>
- import('@/views/benyi_train/video_study/detail'),
- name: 'Detail',
- meta: {
- title: '培训视频详情',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/planweek',
- component: Layout,
- hidden: true,
- children: [{
- path: 'data/:id',
- component: () =>
- import('@/views/benyi/planweek/data'),
- name: 'planweek1',
- meta: {
- title: '周计划(明细)',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/theme',
- component: Layout,
- hidden: true,
- children: [{
- path: 'activity/:id(\\d+)',
- component: () =>
- import('@/views/benyi/theme/activity'),
- name: 'Theme1',
- meta: {
- title: '主题整合内容',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/themetermplan',
- component: Layout,
- hidden: true,
- children: [{
- path: 'data/:id',
- component: () =>
- import('@/views/benyi/themetermplan/data'),
- name: 'Themetermplan1',
- meta: {
- title: '主题整合学期计划(明细)',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/thememonthplan',
- component: Layout,
- hidden: true,
- children: [{
- path: 'data/:id',
- component: () =>
- import('@/views/benyi/thememonthplan/data'),
- name: 'Thememonthplan1',
- meta: {
- title: '主题整合月计划(明细)',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/themeweekplan',
- component: Layout,
- hidden: true,
- children: [{
- path: 'data/:id',
- component: () =>
- import('@/views/benyi/themeweekplan/data'),
- name: 'Themeweekplan1',
- meta: {
- title: '主题整合周计划(明细)',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/themeweekplanprint',
- component: Layout,
- hidden: true,
- children: [{
- path: 'table/:id',
- component: () =>
- import('@/views/benyi/themeweekplan/table'),
- name: 'Themeweekplan2',
- meta: {
- title: '主题整合周计划(表格)',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/thememonthplanprint',
- component: Layout,
- hidden: true,
- children: [{
- path: 'table/:id',
- component: () =>
- import('@/views/benyi/thememonthplan/table'),
- name: 'Thememonthplan2',
- meta: {
- title: '主题整合月计划(表格)',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/themetermplanprint',
- component: Layout,
- hidden: true,
- children: [{
- path: 'table/:id',
- component: () =>
- import('@/views/benyi/themetermplan/table'),
- name: 'Themetermplan2',
- meta: {
- title: '主题整合学期计划(表格)',
- icon: ''
- }
- }]
- },
- {
- path: '/benyi_course/math',
- component: Layout,
- hidden: true,
- children: [{
- path: 'plan/:id(\\d+)',
- component: () =>
- import('@/views/benyi/math/plan'),
- name: 'Math1',
- meta: {
- title: '游戏数学方案',
- icon: ''
- }
- }]
- },
- {
- path: '/job',
- component: Layout,
- hidden: true,
- children: [{
- path: 'log',
- component: () =>
- import('@/views/monitor/job/log'),
- name: 'JobLog',
- meta: {
- title: '调度日志'
- }
- }]
- },
- {
- path: '/gen',
- component: Layout,
- hidden: true,
- children: [{
- path: 'edit',
- component: () =>
- import('@/views/tool/gen/editTable'),
- name: 'GenEdit',
- meta: {
- title: '修改生成配置'
- }
- }]
- }
+ import ('@/views/benyi/experience/choose'),
+ hidden: true,
+ children: [{
+ path: '/experience/apply/:id(\\d+)',
+ component: () =>
+ import ('@/views/benyi/experience/apply'),
+ hidden: true
+ },
+ {
+ path: '/experience/result/:id(\\d+)',
+ component: () =>
+ import ('@/views/benyi/experience/result'),
+ hidden: true
+ }
+ ]
+ },
+ {
+ path: '',
+ component: Layout,
+ redirect: 'index',
+ children: [{
+ path: 'index',
+ component: () =>
+ import ('@/views/index'),
+ name: '首页',
+ meta: {
+ title: '首页',
+ icon: 'dashboard',
+ noCache: true,
+ affix: true
+ }
+ }]
+ },
+ {
+ path: '/user',
+ component: Layout,
+ hidden: true,
+ redirect: 'noredirect',
+ children: [{
+ path: 'profile',
+ component: () =>
+ import ('@/views/system/user/profile/index'),
+ name: 'Profile',
+ meta: {
+ title: '个人中心',
+ icon: 'user'
+ }
+ }]
+ },
+ {
+ path: '/user/change',
+ component: Layout,
+ hidden: true,
+ redirect: 'noredirect',
+ children: [{
+ path: 'dept',
+ component: () =>
+ import ('@/views/system/user/change/dept/index'),
+ name: 'Changedept',
+ meta: {
+ title: '切换岗位',
+ icon: 'user'
+ }
+ }]
+ },
+ {
+ path: '/dict',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'type/data/:dictId(\\d+)',
+ component: () =>
+ import ('@/views/system/dict/data'),
+ name: 'Data',
+ 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/dayflowmanger',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'dayflowtask/standard/:code(\\d+)',
+ component: () =>
+ import ('@/views/benyi/dayflow/standard'),
+ name: 'Standard',
+ meta: {
+ title: '一日流程标准',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/dayflow/dayflowmanger/dayflowtask',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'standard/unscramble/:id(\\d+)',
+ component: () =>
+ import ('@/views/benyi/dayflow/unscramble'),
+ name: 'unscramble',
+ meta: {
+ title: '一日流程标准解读',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/video_study',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'study/detail/:id(\\d+)',
+ component: () =>
+ import ('@/views/benyi_train/video_study/detail'),
+ name: 'Detail',
+ meta: {
+ title: '培训视频详情',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/planweek',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'data/:id',
+ component: () =>
+ import ('@/views/benyi/planweek/data'),
+ name: 'planweek1',
+ meta: {
+ title: '周计划(明细)',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/theme',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'activity/:id(\\d+)',
+ component: () =>
+ import ('@/views/benyi/theme/activity'),
+ name: 'Theme1',
+ meta: {
+ title: '主题整合内容',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/themetermplan',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'data/:id',
+ component: () =>
+ import ('@/views/benyi/themetermplan/data'),
+ name: 'Themetermplan1',
+ meta: {
+ title: '主题整合学期计划(明细)',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/thememonthplan',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'data/:id',
+ component: () =>
+ import ('@/views/benyi/thememonthplan/data'),
+ name: 'Thememonthplan1',
+ meta: {
+ title: '主题整合月计划(明细)',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/themeweekplan',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'data/:id',
+ component: () =>
+ import ('@/views/benyi/themeweekplan/data'),
+ name: 'Themeweekplan1',
+ meta: {
+ title: '主题整合周计划(明细)',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/themeweekplanprint',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'table/:id',
+ component: () =>
+ import ('@/views/benyi/themeweekplan/table'),
+ name: 'Themeweekplan2',
+ meta: {
+ title: '主题整合周计划(表格)',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/planweekprint',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'table/:id',
+ component: () =>
+ import ('@/views/benyi/planweek/table'),
+ name: 'planweek2',
+ meta: {
+ title: '主题整合周计划(表格)',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/thememonthplanprint',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'table/:id',
+ component: () =>
+ import ('@/views/benyi/thememonthplan/table'),
+ name: 'Thememonthplan2',
+ meta: {
+ title: '主题整合月计划(表格)',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/themetermplanprint',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'table/:id',
+ component: () =>
+ import ('@/views/benyi/themetermplan/table'),
+ name: 'Themetermplan2',
+ meta: {
+ title: '主题整合学期计划(表格)',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/benyi_course/math',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'plan/:id(\\d+)',
+ component: () =>
+ import ('@/views/benyi/math/plan'),
+ name: 'Math1',
+ meta: {
+ title: '游戏数学方案',
+ icon: ''
+ }
+ }]
+ },
+ {
+ path: '/job',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'log',
+ component: () =>
+ import ('@/views/monitor/job/log'),
+ name: 'JobLog',
+ meta: {
+ title: '调度日志'
+ }
+ }]
+ },
+ {
+ path: '/gen',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'edit',
+ component: () =>
+ import ('@/views/tool/gen/editTable'),
+ name: 'GenEdit',
+ meta: {
+ title: '修改生成配置'
+ }
+ }]
+ }
]
export default new Router({
- mode: 'history', // 去掉url中的#
- scrollBehavior: () => ({
- y: 0
- }),
- routes: constantRoutes
-})
+ mode: 'history', // 去掉url中的#
+ scrollBehavior: () => ({
+ y: 0
+ }),
+ routes: constantRoutes
+})
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/planweek/data.vue b/ruoyi-ui/src/views/benyi/planweek/data.vue
index 39141203f..59fea12dc 100644
--- a/ruoyi-ui/src/views/benyi/planweek/data.vue
+++ b/ruoyi-ui/src/views/benyi/planweek/data.vue
@@ -32,24 +32,6 @@
placeholder="选择活动时间"
></el-date-picker>
</el-form-item>
- <!-- <el-form-item label="创建人" prop="createuserid">
- <el-input
- v-model="queryParams.createuserid"
- placeholder="请输入创建人"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="修改人" prop="updateuserid">
- <el-input
- v-model="queryParams.updateuserid"
- placeholder="请输入修改人"
- clearable
- size="small"
- @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>
@@ -294,7 +276,7 @@ export default {
const planweekid = this.$route.params && this.$route.params.id;
this.getPlanweek2(planweekid);
this.getPlanWeekList();
- this.getDicts("sys_math_type").then(response => {
+ this.getDicts("sys_dm_qyhdxs").then(response => {
this.activitytypeOptions = response.data;
});
},
diff --git a/ruoyi-ui/src/views/benyi/planweek/index.vue b/ruoyi-ui/src/views/benyi/planweek/index.vue
index 9a988fe8d..44288dc1f 100644
--- a/ruoyi-ui/src/views/benyi/planweek/index.vue
+++ b/ruoyi-ui/src/views/benyi/planweek/index.vue
@@ -55,7 +55,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:planweek:add']"
+ v-hasPermi="['benyi:planweek:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@@ -65,7 +65,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:planweek:edit']"
+ v-hasPermi="['benyi:planweek:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@@ -75,18 +75,10 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:planweek:remove']"
+ v-hasPermi="['benyi:planweek:remove']"
>删除</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['system:planweek:export']"
- >导出</el-button>
- </el-col>
+
</el-row>
<el-table v-loading="loading" :data="planweekList" @selection-change="handleSelectionChange">
@@ -123,23 +115,22 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:planweek:edit']"
+ v-hasPermi="['benyi:planweek:edit']"
>修改</el-button>
- <!-- <el-button
- size="mini"
- type="text"
- icon="el-icon-check"
- @click="handleCheck(scope.row)"
- v-hasPermi="['system:planweek:edit']"
- v-show="isShow(scope.row)"
- >提交</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:planweek:remove']"
+ v-hasPermi="['benyi:planweek:remove']"
>删除</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="handleView(scope.row)"
+ v-hasPermi="['benyi:planweek:query']"
+ >预览</el-button>
</template>
</el-table-column>
</el-table>
@@ -359,17 +350,7 @@ export default {
this.classOptions = response.rows;
});
},
- // // 主题名称家班级
- // getClassName(val) {
- // //locations是v-for里面的也是datas里面的值
- // let obj = {};
- // obj = this.classOptions.find((item) => {
- // return item.bjbh === val;
- // });
- // let getName = "";
- // getName = obj.bjmc;
- // this.form.name = getName;
- // },
+
// 当前状态翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status);
@@ -522,6 +503,13 @@ export default {
})
.catch(function() {});
},
+ /** 预览按钮操作 */
+ handleView(row) {
+ const id = row.id;
+ this.$router.push({
+ path: "/benyi_course/planweekprint/table/"+id,
+ });
+ },
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
diff --git a/ruoyi-ui/src/views/benyi/planweek/table.vue b/ruoyi-ui/src/views/benyi/planweek/table.vue
index 7e932dd96..f309f6fd9 100644
--- a/ruoyi-ui/src/views/benyi/planweek/table.vue
+++ b/ruoyi-ui/src/views/benyi/planweek/table.vue
@@ -28,27 +28,56 @@
{{monththeme}}
</td>
</tr>
- <tr v-for="item in weekplanitemList" :key="item.daytime">
- <td v-if="item.theme" :rowspan="bodyData.weekplanitemList.length" class="align-center">
- <span>{{item.theme}}</span>
+
+ <tr class="align-center">
+ <td rowspan="5">
+ <span>周教学目标</span>
</td>
- <td class="align-center">{{item.daytime}} / 星期{{item.zhou}}</td>
- <td colspan="4">{{item.jzzc}}</td>
+ <td style="width: 140px;">社会</td>
+ <td>{{sh}}</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr class="align-center">
+ <td>语言</td>
+ <td>{{yy}}</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr class="align-center">
+ <td>健康</td>
+ <td>{{jk}}</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr class="align-center">
+ <td>科学</td>
+ <td>{{kx}}</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr class="align-center">
+ <td>艺术</td>
+ <td>{{ys}}</td>
+ <td colspan="4"></td>
+ </tr>
+
+ <tr v-for="item in planweekitemList" :key="item.id">
+ <td v-if="item.activitytime" :rowspan="bodyData.planweekitemList.length" class="align-center">
+ <span>{{item.activitytime}}</span>
+ </td>
+ <td class="align-center">{{item.activitytime}}</td>
+ <td colspan="4">{{item.activitytime}}</td>
</tr>
<tr class="align-center table-bg">
<td v-for="h in bodyData.title" :key="h.prop">
<b>{{h.label}}</b>
</td>
</tr>
- <tr v-for="item in bodyData.weekplanitemList" :key="item.daytime">
- <td v-if="item.theme" :rowspan="bodyData.weekplanitemList.length" class="align-center">
+ <tr v-for="item in bodyData.planweekitemList" :key="item.id">
+ <td v-if="item.theme" :rowspan="bodyData.planweekitemList.length" class="align-center">
<span>{{item.theme}}</span>
</td>
- <td class="align-center">{{item.daytime}} / 星期{{item.zhou}}</td>
- <td>{{themeactivityFormat(item.activityid)}}</td>
- <td class="align-center">{{fzxzFormat(item.fzxz)}}</td>
- <td>{{item.jzzc}}</td>
- <td>{{item.jzzc}}</td>
+ <td class="align-center">{{item.activitytime}}</td>
+ <td class="align-center">{{item.day}}</td>
+ <td class="align-center">{{activitytypeFormat(item.activitytype)}}</td>
+ <td class="align-center">{{(item.content)}}</td>
</tr>
</table>
<!-- <p
@@ -60,15 +89,15 @@
<script>
import {
- listWeekplanitem,
- getWeekplanitem,
-} from "@/api/benyi/themeweekplanitem";
+ listPlanweekitem,
+ getPlanweekitem,
+ delPlanweekitem,
+ addPlanweekitem,
+ updatePlanweekitem,
+ exportPlanweekitem
+} from "@/api/benyi/planweekitem";
-import { listWeekplan, getWeekplan } from "@/api/benyi/themeweekplan";
-import { listActivityByThemeId } from "@/api/benyi/activity";
-import { listMonthplan } from "@/api/benyi/thememonthplan";
-import { listMonthplanitem } from "@/api/benyi/thememonthplanitem";
-import { listThemeByIds, listThemeByActivityIds } from "@/api/benyi/theme";
+import { getPlanweek, listPlanweek } from "@/api/benyi/planweek";
export default {
name: "PlayTable",
@@ -83,90 +112,78 @@ export default {
monththeme: "",
bz: "",
spyj: "",
+ sh: "",
+ yy: "",
+ jk: "",
+ kx: "",
+ ys: "",
//根据活动id获取的theme名称
themenamebyactivityids: "",
+ activitytypeOptions: [],
//分组性质
fzxzOptions: [],
- //主题活动
- themeactivityOptions: [],
- weekplanitemList: [],
+ // item列表
+ planweekitemList: [],
bodyData: {
title: [
{
- label: "活动",
- prop: "theme",
+ label: "日期",
+ prop: "activitytime",
},
{
- label: "周一",
+ label: "星期",
prop: "day",
},
{
- label: "周二",
- prop: "name",
+ label: "区域活动形式",
+ prop: "activitytype",
},
{
- label: "周三",
- prop: "term",
- },
- {
- label: "周四",
- prop: "help",
- },
- {
- label: "周五",
- prop: "help",
+ label: "活动详情",
+ prop: "content",
},
+
+ // {
+ // label: "周四",
+ // prop: "help",
+ // },
+ // {
+ // label: "周五",
+ // prop: "help",
+ // },
],
- weekplanitemList: [
+ planweekitemList: [
{
theme: "春天的颜色",
},
- // {
- // day: "周二",
- // name: "活动",
- // term: "同质",
- // },
- // {
- // day: "周三",
- // name: "活动",
- // term: "同质",
- // },
- // {
- // day: "周四",
- // name: "活动",
- // term: "同质",
- // },
- // {
- // day: "周五",
- // name: "活动",
- // term: "同质",
- // },
],
},
// 查询参数
queryParams: {
- wpid: undefined,
- },
- // 查询参数
- queryParams_MonPlan: {
- xnxq: undefined,
- month: undefined,
- status: "2",
- },
- queryParams_MonPlanItem: {
- mpid: undefined,
- zc: undefined,
+ wid: undefined,
},
+
};
},
created() {
- const themeweekplanid = this.$route.params && this.$route.params.id;
- this.getThemeWeekPlan(themeweekplanid);
+ const planweekid = this.$route.params && this.$route.params.id;
+ this.getWPlanweek(planweekid);
this.getDicts("sys_dm_fzxz").then((response) => {
this.fzxzOptions = response.data;
});
+ this.getDicts("sys_dm_qyhdxs").then(response => {
+ this.activitytypeOptions = response.data;
+ });
},
methods: {
+ // 活动类型字典翻译
+ activitytypeFormat(activitytype) {
+ return this.selectDictLabel(this.activitytypeOptions, activitytype);
+ },
+ // 分组性质类型--字典状态字典翻译
+ fzxzFormat(fzxz) {
+ return this.selectDictLabel(this.fzxzOptions, fzxz);
+ },
//主题翻译
async themeFormat(themeids) {
var themename = "";
@@ -209,67 +226,41 @@ export default {
}
return "";
},
- // 分组性质类型--字典状态字典翻译
- fzxzFormat(fzxz) {
- return this.selectDictLabel(this.fzxzOptions, fzxz);
- },
- //主题活动
- getThemeActivityList(themeid) {
- listActivityByThemeId(themeid).then((response) => {
- //console.log(response.rows);
- this.themeactivityOptions = response.rows;
- });
- },
+
//获取周教学计划详情
- getThemeWeekPlan(themeweekplanid) {
- getWeekplan(themeweekplanid).then((response) => {
+ getWPlanweek(planweekid) {
+ getPlanweek(planweekid).then((response) => {
//(response);
+ this.queryParams.wid = response.data.id;
+ this.defaultWeekType = response.data.id;
+ this.month = response.data.month;
+ this.zc = response.data.weekly;
+ this.monththeme = response.data.themeofweek;
+ this.sh = response.data.jxmbSh;
+ this.yy = response.data.jxmbYy;
+ this.jk = response.data.jxmbJk;
+ this.kx = response.data.jxmbKx;
+ this.ys = response.data.jxmbYs;
+ // console.log(this.month);
+
this.queryParams.wpid = response.data.id;
this.title = response.data.name;
- this.zc = response.data.zc;
- this.month = response.data.month;
+
+ //this.month = response.data.month;
this.classname = response.classname;
this.tbr = response.createusername;
this.bz = response.data.remark;
this.spyj = response.data.shyj;
- //查找活动id
- this.queryParams_MonPlan.month = response.data.month;
- this.queryParams_MonPlan.xnxq = response.data.xnxq;
- listMonthplan(this.queryParams_MonPlan).then((resMonPlan) => {
- //console.log(resMonPlan.rows);
- //获取的月主题
- var monththemeids = resMonPlan.rows[0].themes;
-
- this.themeFormat(monththemeids);
-
- this.queryParams_MonPlanItem.mpid = resMonPlan.rows[0].id;
- this.queryParams_MonPlanItem.zc = response.data.zc;
- listMonthplanitem(this.queryParams_MonPlanItem).then(
- (resMonPlanItem) => {
- //console.log(resMonPlanItem.rows);
- var activityids = resMonPlanItem.rows[0].activityid.split(";");
- var array = [];
- //console.log(arr);
- activityids.forEach(function (value, key, arr) {
- //console.log(value); // 结果依次为1，2，3
- if (value != "") {
- array.push(parseInt(value));
- }
- });
- this.getThemeActivityList(array);
- }
- );
- });
-
this.getList();
});
},
/** 查询主题整合周计划明细列表 */
async getList() {
//console.log(this.queryParams.wpid);
- await listWeekplanitem(this.queryParams).then((response) => {
- this.bodyData.weekplanitemList = response.rows;
+ await listPlanweekitem(this.queryParams).then((response) => {
+ this.bodyData.planweekitemList = response.rows;
+ // console.log(this.bodyData.planweekitemList);
//获取所有的活动id
var activityIds = "";
@@ -284,28 +275,9 @@ export default {
array.push(parseInt(value));
}
});
- //获取所有的活动id截止
- this.getThemeByActivityIds(array);
});
},
- //根据活动id获取theme列表
- async getThemeByActivityIds(array) {
- if (array.length > 0) {
- var themename = "";
- await listThemeByActivityIds(array).then((response) => {
- response.rows.forEach(function (value, key, arr) {
- themename = themename + value.name + ";";
- });
- });
- //console.log(themename);
- this.themenamebyactivityids = themename;
- }
-
- this.bodyData.weekplanitemList[0].theme =
- this.themenamebyactivityids == ""
- ? "未设置"
- : this.themenamebyactivityids;
- },
+
prints() {
//console.log(this.$refs.printMe);
this.$print(this.$refs.printMe);