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

修改bug

This commit is contained in:
yangjun 2023-05-31 16:21:12 +08:00
parent de6e7c6415
commit ec63c5e045
14 changed files with 76 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/kc/pktj/pkfgl/pkfgl.vue
View File

@ -6,7 +6,8 @@
<a-row> <a-row>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="" style="padding: 10px;"> <a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="评课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" /> <!-- <JDictSelectTag placeholder="评课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" /> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" @change="loadData"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">

8
src/views/kc/pktj/pkmxb/pkmxb.vue
View File

@ -9,7 +9,8 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item label=""> <a-form-item label="">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> <!-- <JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
@ -83,6 +84,7 @@
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { dateFormat } from '/@/utils/common/compUtils'; import { dateFormat } from '/@/utils/common/compUtils';
import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue'; import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue';
import { getSysConfig } from '/@/views/site/utils/index';
const queryParam = ref<any>({}); const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false); const toggleSearchStatus = ref<boolean>(false);
@ -129,9 +131,7 @@ const viewModal = ref();
//进入就加载 //进入就加载
onMounted(() => { onMounted(() => {
const format = 'yyyy-MM-dd'; const format = 'yyyy-MM-dd';
const startTime = new Date(); queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format)
startTime.setTime(startTime.getTime()-60000*60*24*7)
queryParam.value.startTime = dateFormat(startTime, format)
queryParam.value.endTime = dateFormat(new Date(), format) queryParam.value.endTime = dateFormat(new Date(), format)
}); });

8
src/views/kc/pktj/pktjb/pktjb.vue
View File

@ -6,7 +6,8 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item label=""> <a-form-item label="">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> <!-- <JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
@ -72,6 +73,7 @@
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './pktjb.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './pktjb.api';
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getSysConfig } from '/@/views/site/utils/index';
const queryParam = ref<any>({}); const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false); const toggleSearchStatus = ref<boolean>(false);
@ -116,9 +118,7 @@
//进入就加载 //进入就加载
onMounted(() => { onMounted(() => {
const format = 'yyyy-MM-dd'; const format = 'yyyy-MM-dd';
const startTime = new Date(); queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format)
startTime.setTime(startTime.getTime()-60000*60*24*7)
queryParam.value.startTime = dateFormat(startTime, format)
queryParam.value.endTime = dateFormat(new Date(), format) queryParam.value.endTime = dateFormat(new Date(), format)
}); });
/** /**

3
src/views/kc/pktj/pkztj/pkztj.vue
View File

@ -6,7 +6,8 @@
<a-row> <a-row>
<a-col :span="5"> <a-col :span="5">
<a-form-item label="" style="padding: 10px;"> <a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="评课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" /> <!-- <JDictSelectTag placeholder="评课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" /> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" @change="loadData"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="5"> <a-col :span="5">

2
src/views/kc/szkc/components/XzKechengbiao.data.ts
View File

@ -25,13 +25,11 @@ export const columns = <JVxeColumn[]>([
{ {
title: '开课单位', title: '开课单位',
align: "left", align: "left",
width: '100px',
key: 'kkdw' key: 'kkdw'
}, },
{ {
title: '课程性质', title: '课程性质',
align: "left", align: "left",
width: '105px',
key: 'kcxz_dictText' key: 'kcxz_dictText'
}, },
// { // {

10
src/views/kc/tktj/kcTingke/KcTingkeList.vue
View File

@ -5,7 +5,8 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item label=""> <a-form-item label="">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> <!-- <JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
@ -76,6 +77,7 @@
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import KcTingkeModal from './components/KcTingkeModal.vue' import KcTingkeModal from './components/KcTingkeModal.vue'
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getSysConfig } from '/@/views/site/utils/index';
const queryParam = ref<any>({}); const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false); const toggleSearchStatus = ref<boolean>(false);
@ -120,9 +122,9 @@
//进入就加载 //进入就加载
onMounted(() => { onMounted(() => {
const format = 'yyyy-MM-dd'; const format = 'yyyy-MM-dd';
const startTime = new Date(); // const startTime = new Date();
startTime.setTime(startTime.getTime()-60000*60*24*7) // startTime.setTime(startTime.getTime()-60000*60*24*7)
queryParam.value.startTime = dateFormat(startTime, format) queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format)
queryParam.value.endTime = dateFormat(new Date(), format) queryParam.value.endTime = dateFormat(new Date(), format)
}); });
/** /**

10
src/views/kc/tktj/kcTingke/kkdw.vue
View File

@ -5,7 +5,8 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="3"> <a-col :span="3">
<a-form-item label=""> <a-form-item label="">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> <!-- <JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
@ -66,6 +67,7 @@
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './kkdw.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './kkdw.api';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { dateFormat } from '/@/utils/common/compUtils'; import { dateFormat } from '/@/utils/common/compUtils';
import { getSysConfig } from '/@/views/site/utils/index';
const queryParam = ref<any>({}); const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false); const toggleSearchStatus = ref<boolean>(false);
@ -111,9 +113,9 @@
//进入就加载 //进入就加载
onMounted(() => { onMounted(() => {
const format = 'yyyy-MM-dd'; const format = 'yyyy-MM-dd';
const startTime = new Date(); // const startTime = new Date();
startTime.setTime(startTime.getTime()-60000*60*24*7) // startTime.setTime(startTime.getTime()-60000*60*24*7)
queryParam.value.startTime = dateFormat(startTime, format) queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format)
queryParam.value.endTime = dateFormat(new Date(), format) queryParam.value.endTime = dateFormat(new Date(), format)
}); });

3
src/views/kc/tktj/tkfgl/tkfgl.vue
View File

@ -6,7 +6,8 @@
<a-row> <a-row>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="" style="padding: 10px;"> <a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" /> <!-- <JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" /> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" @change="loadData"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">

8
src/views/kc/tktj/tkmx/tkmx.vue
View File

@ -6,7 +6,8 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="3"> <a-col :span="3">
<a-form-item label=""> <a-form-item label="">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> <!-- <JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
@ -62,6 +63,7 @@
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './tkmx.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './tkmx.api';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { dateFormat } from '/@/utils/common/compUtils'; import { dateFormat } from '/@/utils/common/compUtils';
import { getSysConfig } from '/@/views/site/utils/index';
const queryParam = ref<any>({}); const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false); const toggleSearchStatus = ref<boolean>(false);
@ -107,9 +109,7 @@
//进入就加载 //进入就加载
onMounted(() => { onMounted(() => {
const format = 'yyyy-MM-dd'; const format = 'yyyy-MM-dd';
const startTime = new Date(); queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format)
startTime.setTime(startTime.getTime()-60000*60*24*7)
queryParam.value.startTime = dateFormat(startTime, format)
queryParam.value.endTime = dateFormat(new Date(), format) queryParam.value.endTime = dateFormat(new Date(), format)
}); });

3
src/views/kc/tktj/tkztj/tkztj.vue
View File

@ -6,7 +6,8 @@
<a-row> <a-row>
<a-col :span="5"> <a-col :span="5">
<a-form-item label="" style="padding: 10px;"> <a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" /> <!-- <JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" /> -->
<j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" @change="loadData"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="5"> <a-col :span="5">

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

@ -4,22 +4,48 @@
<div id="topDiv" v-show="props.showRightButton"> <div id="topDiv" v-show="props.showRightButton">
<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 }">
<div class="topButton" @click="toTop"> <div class="topButton" @click="toTop" style="float: right;">
<ArrowUpOutlined/> <ArrowUpOutlined/>
</div> </div>
</a-col> </a-col>
<a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }"> <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }">
<div class="topYiJianFanKui" @click="funYjfk"> <div class="topYiJianFanKui" @click="funYjfk" style="float: right;">
意见反馈 意见反馈
</div> </div>
</a-col> </a-col>
<div style="line-height: 1rem;width: 100%;">&nbsp;</div> <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }">
<div style="line-height: 3rem;padding-top: 0.5rem;font-size: .7rem;" class="topLinkTextEllipsis"><a class="abox" @click="toDom('tkzjDom')">听课足迹</a></div>
<div style="line-height: 3rem;padding-top: 0.5rem;font-size: .7rem;" class="topLinkTextEllipsis"><a class="abox" @click="toDom('rkjcDom')">任课教程</a></div> <a-menu style="margin-top: 20px;" :selectable="false">
<div style="line-height: 3rem;padding-top: 0.5rem;font-size: .7rem;" class="topLinkTextEllipsis"><a class="abox" @click="toDom('yykcDom')">预约课程</a></div> <a-menu-item key="1">
<div style="line-height: 3rem;padding-top: 0.5rem;font-size: .7rem;" class="topLinkTextEllipsis"><a class="abox" @click="toDom('jcgkkDom')">精彩公开课</a></div> <a class="abox" @click="toDom('tkzjDom')">听课足迹</a>
<div style="line-height: 3rem;padding-top: 0.5rem;font-size: .7rem;" class="topLinkTextEllipsis"><a class="abox" @click="toDom('kxstkktDom')">可线上听课课堂</a></div> </a-menu-item>
<div style="line-height: 3rem;padding-top: 0.5rem;font-size: .7rem;" class="topLinkTextEllipsis"><a class="abox" @click="toDom('jrkclbDom')">今日课程列表</a></div> <a-menu-item key="2">
<a class="abox" @click="toDom('rkjcDom')">任教课程</a>
</a-menu-item>
<a-menu-item key="3">
<a class="abox" @click="toDom('yykcDom')">预约课程</a>
</a-menu-item>
<a-menu-item key="4">
<a class="abox" @click="toDom('jcgkkDom')">公&nbsp;&nbsp;开&nbsp;&nbsp;课</a>
</a-menu-item>
<a-menu-item key="5">
<a class="abox" @click="toDom('kxstkktDom')">线上听课</a>
</a-menu-item>
<a-menu-item key="6">
<a class="abox" @click="toDom('jrkclbDom')">今日课程</a>
</a-menu-item>
</a-menu>
<!-- <div style="background-color: #fff;">
<div>&nbsp;</div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('tkzjDom')">听课足迹</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('rkjcDom')">任教课程</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('yykcDom')">预约课程</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('jcgkkDom')">公&nbsp;&nbsp;开&nbsp;&nbsp;课</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('kxstkktDom')">线上听课</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('jrkclbDom')">今日课程</a></div>
</div> -->
</a-col>
</a-row> </a-row>
</div> </div>
<span class="topTitle" > <span class="topTitle" >
@ -125,7 +151,7 @@ function toIndex(){
right: 1rem; right: 1rem;
top: 5rem; top: 5rem;
z-index: 1; z-index: 1;
width: 4rem; width: 100px;
.topButton { .topButton {
background: #c2c2c2; background: #c2c2c2;
margin-bottom: 2rem; margin-bottom: 2rem;
@ -142,6 +168,7 @@ function toIndex(){
line-height: 2.1rem; line-height: 2.1rem;
} }
.topLinkTextEllipsis { .topLinkTextEllipsis {
line-height: 18px;
overflow:hidden; overflow:hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -150,11 +177,11 @@ function toIndex(){
.abox { .abox {
//border-radius: 50%; //border-radius: 50%;
//background: #1c84c6; //background: #1c84c6;
padding: 0.5rem 0.5rem 0.5rem 0;
//color: #fff; //color: #fff;
//order: dotted red; //order: dotted red;
border: dotted #1c84c6; // padding: 0.5rem 0.5rem 0.5rem 0;
color: black; // border: dotted #1c84c6;
// color: black;
} }
} }

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

@ -14,7 +14,7 @@
<tongZhiGongGaoPage/> <tongZhiGongGaoPage/>
<!-- 听课足迹 --> <!-- 听课足迹 -->
<tingKeZuJiPage v-if="getUserSf()=='T'"/> <tingKeZuJiPage v-if="getUserSf()=='T'"/>
<!-- 任课教程 --> <!-- 任教教程 -->
<renKeJiaoChengPage v-if="getUserSf()=='T'"/> <renKeJiaoChengPage v-if="getUserSf()=='T'"/>
<!-- 预约课程 --> <!-- 预约课程 -->
<yuYueKeChengPage ref="yykcModeal" @orther-load="yykcLoad" v-if="getUserSf()=='T'"/> <yuYueKeChengPage ref="yykcModeal" @orther-load="yykcLoad" v-if="getUserSf()=='T'"/>

2
src/views/site/jrkclb/kclbList.vue
View File

@ -201,6 +201,6 @@ const saveOrUpdate = (params, isUpdate) => {
background-color: #1c84c6;font-weight: 600;color:#fff;border-radius: 5px;line-height: 23px; background-color: #1c84c6;font-weight: 600;color:#fff;border-radius: 5px;line-height: 23px;
} }
.bcClass{ .bcClass{
background-color: #1c84c6;font-weight: 600;border-radius: 5px;line-height: 23px;margin-left: 20px; background-color: #1c84c6;font-weight: 600;border-radius: 5px;line-height: 23px;
} }
</style> </style>

5
src/views/site/yuYueKeCheng/index.vue
View File

@ -34,7 +34,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<div style="margin-top:20px;"> <div style="margin-top:20px;text-align:center;">
<a-button type="primary" class="itemYyButton" @click="tingKeZuJiAddModal.view({ ketangbiaoid: item.id })">评价</a-button> <a-button type="primary" class="itemYyButton" @click="tingKeZuJiAddModal.view({ ketangbiaoid: item.id })">评价</a-button>
<a-button type="primary" class="itemBaoCuoButton" @click="funQxyy(item)">取消预约</a-button> <a-button type="primary" class="itemBaoCuoButton" @click="funQxyy(item)">取消预约</a-button>
</div> </div>
@ -184,15 +184,14 @@ defineExpose({
} }
.itemYyButton { .itemYyButton {
background-color: #1c84c6; background-color: #1c84c6;
float: left;
font-weight: 600; font-weight: 600;
border-radius: 5px; border-radius: 5px;
} }
.itemBaoCuoButton { .itemBaoCuoButton {
background-color: #1c84c6; background-color: #1c84c6;
float: right;
font-weight: 600; font-weight: 600;
border-radius: 5px; border-radius: 5px;
margin-left: 15px;
} }