yangjun
/
dbsd_kczx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-06-14 08:24:39 +08:00
parent e420d6b04f
commit d69ae8aca2
10 changed files with 119 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/kc/kcGongkaike/components/KcGongkaikeForm.vue
View File

@ -13,8 +13,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="职务" v-bind="validateInfos.zc"> <a-form-item label="职称" v-bind="validateInfos.zc">
<JDictSelectTag placeholder="请选择职务" v-model:value="formData.zc" :disabled="disabled" dictCode="zhiwu" /> <JDictSelectTag placeholder="请选择职称" v-model:value="formData.zc" :disabled="disabled" dictCode="zhicheng" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">

5
src/views/kc/kcSuggestions/KcSuggestions.data.ts
View File

@ -15,6 +15,11 @@ export const columns: BasicColumn[] = [
align: "center", align: "center",
dataIndex: 'username' dataIndex: 'username'
}, },
{
title: '提交人身份',
align: "center",
dataIndex: 'tjrsf'
},
{ {
title: '提交时间', title: '提交时间',
align: "center", align: "center",

30
src/views/kc/kcSysConfig/KcSysConfig.data.ts
View File

@ -39,6 +39,21 @@ export const columns: BasicColumn[] = [
align: "center", align: "center",
dataIndex: 'flag5' dataIndex: 'flag5'
}, },
{
title: '预留字段6',
align: "center",
dataIndex: 'flag6'
},
{
title: '预留字段7',
align: "center",
dataIndex: 'flag7'
},
{
title: '预留字段8',
align: "center",
dataIndex: 'flag8'
},
]; ];
//查询数据 //查询数据
@ -81,6 +96,21 @@ export const formSchema: FormSchema[] = [
label: '预留字段5', label: '预留字段5',
field: 'flag5', field: 'flag5',
component: 'Input', component: 'Input',
},
{
label: '预留字段6',
field: 'flag6',
component: 'Input',
},
{
label: '预留字段7',
field: 'flag7',
component: 'Input',
},
{
label: '预留字段8',
field: 'flag8',
component: 'Input',
}, },
// TODO 主键隐藏字段，目前写死为ID // TODO 主键隐藏字段，目前写死为ID
{ {

38
src/views/kc/kcSysConfig/components/KcSysConfigForm.vue
View File

@ -13,28 +13,43 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="预留字段1" v-bind="validateInfos.flag1"> <a-form-item label="是否开启听课足迹" v-bind="validateInfos.flag1">
<a-input v-model:value="formData.flag1" placeholder="请输入预留字段1" :disabled="disabled"></a-input> <JDictSelectTag type="radio" v-model:value="formData.flag1" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="预留字段2" v-bind="validateInfos.flag2"> <a-form-item label="是否开启任教课程" v-bind="validateInfos.flag2">
<a-input v-model:value="formData.flag2" placeholder="请输入预留字段2" :disabled="disabled"></a-input> <JDictSelectTag type="radio" v-model:value="formData.flag2" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="预留字段3" v-bind="validateInfos.flag3"> <a-form-item label="是否开启预约课程" v-bind="validateInfos.flag3">
<a-input v-model:value="formData.flag3" placeholder="请输入预留字段3" :disabled="disabled"></a-input> <JDictSelectTag type="radio" v-model:value="formData.flag3" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="预留字段4" v-bind="validateInfos.flag4"> <a-form-item label="是否开启公开课" v-bind="validateInfos.flag4">
<a-input v-model:value="formData.flag4" placeholder="请输入预留字段4" :disabled="disabled"></a-input> <JDictSelectTag type="radio" v-model:value="formData.flag4" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="预留字段5" v-bind="validateInfos.flag5"> <a-form-item label="是否开启线上听课" v-bind="validateInfos.flag5">
<a-input v-model:value="formData.flag5" placeholder="请输入预留字段5" :disabled="disabled"></a-input> <JDictSelectTag type="radio" v-model:value="formData.flag5" dictCode="yn" placeholder="请选择" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="是否开启今日课程" v-bind="validateInfos.flag6">
<JDictSelectTag type="radio" v-model:value="formData.flag6" dictCode="yn" placeholder="请选择" />
</a-form-item>
</a-col>
<a-col :span="24" hidden>
<a-form-item label="是否开启" v-bind="validateInfos.flag7">
<JDictSelectTag type="radio" v-model:value="formData.flag7" dictCode="yn" placeholder="请选择" />
</a-form-item>
</a-col>
<a-col :span="24" hidden>
<a-form-item label="是否开启" v-bind="validateInfos.flag8">
<JDictSelectTag type="radio" v-model:value="formData.flag8" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -67,6 +82,9 @@
flag3: '', flag3: '',
flag4: '', flag4: '',
flag5: '', flag5: '',
flag6: '',
flag7: '',
flag8: '',
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

42
src/views/kc/kcSysConfig/components/KcSysConfigMain.vue
View File

@ -17,24 +17,35 @@
<a-input v-model:value="formData.bxqjssj" placeholder="请输入本学期课程结束时间" ></a-input> <a-input v-model:value="formData.bxqjssj" placeholder="请输入本学期课程结束时间" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24" hidden>
<a-form-item label="预留字段2" v-bind="validateInfos.flag2"> <a-col :span="24">
<a-input v-model:value="formData.flag2" placeholder="请输入预留字段2" ></a-input> <a-form-item label="是否开启听课足迹" v-bind="validateInfos.flag7">
<JDictSelectTag type="radio" v-model:value="formData.flag7" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24" hidden> <a-col :span="24">
<a-form-item label="预留字段3" v-bind="validateInfos.flag3"> <a-form-item label="是否开启任教课程" v-bind="validateInfos.flag2">
<a-input v-model:value="formData.flag3" placeholder="请输入预留字段3" ></a-input> <JDictSelectTag type="radio" v-model:value="formData.flag2" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24" hidden> <a-col :span="24">
<a-form-item label="预留字段4" v-bind="validateInfos.flag4"> <a-form-item label="是否开启预约课程" v-bind="validateInfos.flag3">
<a-input v-model:value="formData.flag4" placeholder="请输入预留字段4" ></a-input> <JDictSelectTag type="radio" v-model:value="formData.flag3" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24" hidden> <a-col :span="24">
<a-form-item label="预留字段5" v-bind="validateInfos.flag5"> <a-form-item label="是否开启公开课" v-bind="validateInfos.flag4">
<a-input v-model:value="formData.flag5" placeholder="请输入预留字段5" ></a-input> <JDictSelectTag type="radio" v-model:value="formData.flag4" dictCode="yn" placeholder="请选择" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="是否开启线上听课" v-bind="validateInfos.flag5">
<JDictSelectTag type="radio" v-model:value="formData.flag5" dictCode="yn" placeholder="请选择" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="是否开启今日课程" v-bind="validateInfos.flag6">
<JDictSelectTag type="radio" v-model:value="formData.flag6" dictCode="yn" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -44,7 +55,7 @@
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
<a-form ref="formRef2" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" hidden> <!-- <a-form ref="formRef2" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" hidden>
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="开始时间" v-bind="validateInfos.flag3"> <a-form-item label="开始时间" v-bind="validateInfos.flag3">
@ -63,7 +74,7 @@
<div v-html="tencentHtml"></div> <div v-html="tencentHtml"></div>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form> -->
</a-spin> </a-spin>
</template> </template>
@ -74,6 +85,7 @@
import { getValueType } from '/@/utils'; import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../KcSysConfig.api'; import { saveOrUpdate } from '../KcSysConfig.api';
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getSysConfig } from '/@/views/site/utils/index'; import { getSysConfig } from '/@/views/site/utils/index';
@ -103,6 +115,8 @@ const queryParam = ref<any>({});
flag3: '', flag3: '',
flag4: '', flag4: '',
flag5: '', flag5: '',
flag6: '',
flag7: '',
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

14
src/views/site/common/header.vue
View File

@ -21,22 +21,22 @@
<a-row > <a-row >
<a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }"> <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }">
<a-menu style="margin-top: 20px;" :selectable="false"> <a-menu style="margin-top: 20px;" :selectable="false">
<a-menu-item key="1"> <a-menu-item key="1" v-if="getSysConfig().flag7=='1'">
<a class="abox" @click="toDom('tkzjDom')">听课足迹</a> <a class="abox" @click="toDom('tkzjDom')">听课足迹</a>
</a-menu-item> </a-menu-item>
<a-menu-item key="2"> <a-menu-item key="2" v-if="getSysConfig().flag2=='1'">
<a class="abox" @click="toDom('rkjcDom')">任教课程</a> <a class="abox" @click="toDom('rkjcDom')">任教课程</a>
</a-menu-item> </a-menu-item>
<a-menu-item key="3"> <a-menu-item key="3" v-if="getSysConfig().flag3=='1'">
<a class="abox" @click="toDom('yykcDom')">预约课程</a> <a class="abox" @click="toDom('yykcDom')">预约课程</a>
</a-menu-item> </a-menu-item>
<a-menu-item key="4"> <a-menu-item key="4" v-if="getSysConfig().flag4=='1'">
<a class="abox" @click="toDom('jcgkkDom')">公&nbsp;&nbsp;开&nbsp;&nbsp;课</a> <a class="abox" @click="toDom('jcgkkDom')">公&nbsp;&nbsp;开&nbsp;&nbsp;课</a>
</a-menu-item> </a-menu-item>
<a-menu-item key="5"> <a-menu-item key="5" v-if="getSysConfig().flag5=='1'">
<a class="abox" @click="toDom('kxstkktDom')">线上听课</a> <a class="abox" @click="toDom('kxstkktDom')">线上听课</a>
</a-menu-item> </a-menu-item>
<a-menu-item key="6"> <a-menu-item key="6" v-if="getSysConfig().flag6=='1'">
<a class="abox" @click="toDom('jrkclbDom')">今日课程</a> <a class="abox" @click="toDom('jrkclbDom')">今日课程</a>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
@ -88,7 +88,7 @@
import { DownOutlined, ArrowUpOutlined } from '@ant-design/icons-vue'; import { DownOutlined, ArrowUpOutlined } from '@ant-design/icons-vue';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import YjfkModal from '/@/views/site/yjfk/YjfkModal.vue'; import YjfkModal from '/@/views/site/yjfk/YjfkModal.vue';
import { getUserSf } from '/@/views/site/utils/index'; import { getUserSf,getSysConfig } from '/@/views/site/utils/index';
const props = defineProps({ const props = defineProps({
showRightButton: { type: Boolean, default: false } showRightButton: { type: Boolean, default: false }

14
src/views/site/index.vue
View File

@ -7,7 +7,7 @@
<!-- 主体部分 --> <!-- 主体部分 -->
<a-layout-content> <a-layout-content>
<!-- 统计 --> <!-- 统计 -->
<tongjiPage v-if="getUserSf()=='T'"/> <tongjiPage v-if="getUserSf()=='T'&&getSysConfig().flag7=='1'"/>
<!-- 轮播图 --> <!-- 轮播图 -->
<lunboPage/> <lunboPage/>
<!-- 通知公告 --> <!-- 通知公告 -->
@ -15,16 +15,16 @@
<!-- 听课足迹 --> <!-- 听课足迹 -->
<tingKeZuJiPage v-if="getUserSf()=='T'"/> <tingKeZuJiPage v-if="getUserSf()=='T'"/>
<!-- 任教教程 --> <!-- 任教教程 -->
<renKeJiaoChengPage v-if="getUserSf()=='T'"/> <renKeJiaoChengPage v-if="getUserSf()=='T'&&getSysConfig().flag2=='1'" />
<!-- 预约课程 --> <!-- 预约课程 -->
<yuYueKeChengPage ref="yykcModeal" @orther-load="yykcLoad" v-if="getUserSf()=='T'"/> <yuYueKeChengPage ref="yykcModeal" @orther-load="yykcLoad" v-if="getUserSf()=='T'&&getSysConfig().flag3=='1'"/>
<!-- 精彩公开课 --> <!-- 精彩公开课 -->
<jingCaiGongKaiKePage v-if="getUserSf()=='T'"/> <jingCaiGongKaiKePage v-if="getUserSf()=='T'&&getSysConfig().flag4=='1'"/>
<!-- 可线上听课课堂 --> <!-- 可线上听课课堂 -->
<kxstkktPage v-if="getUserSf()=='T'"/> <kxstkktPage v-if="getUserSf()=='T'&&getSysConfig().flag5=='1'"/>
<!-- 今日课程列表 --> <!-- 今日课程列表 -->
<a-card class="rowGutter" v-if="getUserSf()=='T'" id="jrkclbDom"> <a-card class="rowGutter" v-if="getUserSf()=='T'&&getSysConfig().flag6=='1'" id="jrkclbDom">
<template #title> <template #title>
<span style="font-size: 24px;font-weight: bold;">今日课程列表</span> <span style="font-size: 24px;font-weight: bold;">今日课程列表</span>
</template> </template>
@ -87,7 +87,7 @@
import StudentJrkbPage from '/@/views/site/studentJrkb/index.vue'; import StudentJrkbPage from '/@/views/site/studentJrkb/index.vue';
import StudentJlrkbPage from '/@/views/site/studentJlrkb/index.vue'; import StudentJlrkbPage from '/@/views/site/studentJlrkb/index.vue';
import { getUserSf } from '/@/views/site/utils/index'; import { getUserSf,getSysConfig } from '/@/views/site/utils/index';
const activeKey = ref('1'); const activeKey = ref('1');
const zzskModeal = ref(); const zzskModeal = ref();

4
src/views/site/kxstkkt/index.vue
View File

@ -67,9 +67,9 @@
<div style="text-align: center;"><a @click="funMore">更多...</a></div> <div style="text-align: center;"><a @click="funMore">更多...</a></div>
<div style="text-align: right;margin-top: -51px;"><a @click="funShouqi">收起</a></div> <div style="text-align: right;margin-top: -51px;"><a @click="funShouqi">收起</a></div>
</div> </div>
<div v-show="current == pageNo"> <!-- <div v-show="current == pageNo">
<div style="text-align: center;"><a @click="funShouqi">收起</a></div> <div style="text-align: center;"><a @click="funShouqi">收起</a></div>
</div> </div> -->
</a-col> </a-col>
</a-row> </a-row>
<!-- 报错列表 --> <!-- 报错列表 -->

4
src/views/site/renKeJiaoCheng/index.vue
View File

@ -26,7 +26,7 @@
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="24" style="text-align: center;padding: 0.5rem;"> <a-col :span="24" style="text-align: center;padding: 0.5rem;">
<a @click="loadNext">加载更多</a> <a @click="loadNext" v-if="currentPageSize != 1">加载更多</a>
<a v-if="currentPageSize != 1" style="float: right;" @click="closePage">收起</a> <a v-if="currentPageSize != 1" style="float: right;" @click="closePage">收起</a>
</a-col> </a-col>
</a-row> </a-row>
@ -158,7 +158,7 @@ async function getTeacherjlrkcb() {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.cardBody { .cardBody {
background: #f3f3f4; // background: #f3f3f4;
} }
.ketangCard { .ketangCard {
margin: .5rem; margin: .5rem;

9
src/views/site/yjfk/YjfkForm.vue
View File

@ -26,7 +26,7 @@
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
import { dateFormat } from '/@/utils/common/compUtils'; import { dateFormat } from '/@/utils/common/compUtils';
//用户相关 //用户相关
import { getUserId } from '/@/views/site/utils/index'; import { getUserId,getUserSf } from '/@/views/site/utils/index';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { Modal } from 'ant-design-vue'; import { Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue'; import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue';
@ -112,6 +112,13 @@
model.userid = getUserId() model.userid = getUserId()
model.username = userStore?.getUserInfo?.realname model.username = userStore?.getUserInfo?.realname
model.suggestionstime = dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss') model.suggestionstime = dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss')
let tkrsf = getUserSf();
if(tkrsf=="S"){
tkrsf = "学生";
}else{
tkrsf = "老师";
}
model.tjrsf = tkrsf;
await saveOrUpdate(model, isUpdate.value) await saveOrUpdate(model, isUpdate.value)
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {