修改bug

This commit is contained in:
yangjun 2023-06-09 08:31:51 +08:00
parent 1494bd0cc1
commit 35b93d00a8
8 changed files with 49 additions and 25 deletions

View File

@ -15,8 +15,9 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8"> <a-col :lg="8">
<a-form-item label="课程性质"> <a-form-item label="上课地点">
<j-dict-select-tag v-model:value="queryParam.kcxz" dictCode="kcxz" placeholder="请选择课程性质"/> <j-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></j-input>
<!-- <j-dict-select-tag v-model:value="queryParam.kcxz" dictCode="kcxz" placeholder="请选择课程性质"/> -->
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8"> <a-col :lg="8">
@ -69,6 +70,7 @@
</template> </template>
<script lang="ts" name="ktgl-kcKechengbiao" setup> <script lang="ts" name="ktgl-kcKechengbiao" setup>
import { JDictSelectTag,JInput } from '/@/components/Form';
import { ref, reactive, onMounted, watch } from 'vue'; import { ref, reactive, onMounted, watch } from 'vue';
import { Popconfirm } from 'ant-design-vue'; import { Popconfirm } from 'ant-design-vue';
// import { useListPage } from '/@/ho oks/system/useListPage'; // import { useListPage } from '/@/ho oks/system/useListPage';
@ -78,7 +80,6 @@
import { list, batchDelete,deleteOne, saveOrUpdate } from './KcKechengbiao.api'; import { list, batchDelete,deleteOne, saveOrUpdate } from './KcKechengbiao.api';
import XzKechengbiaoList from './components/XzKechengbiaoListModal.vue' import XzKechengbiaoList from './components/XzKechengbiaoListModal.vue'
import YcKechengbiaoListModal from './components/YcKechengbiaoListModal.vue' import YcKechengbiaoListModal from './components/YcKechengbiaoListModal.vue'
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types'; import { JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
import { filterObj } from '/@/utils/common/compUtils'; import { filterObj } from '/@/utils/common/compUtils';

View File

@ -18,6 +18,8 @@
</a-row> </a-row>
</div> </div>
<div id="leftDiv" v-show="props.showRightButton"> <div id="leftDiv" v-show="props.showRightButton">
<a-row >
<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">
<a class="abox" @click="toDom('tkzjDom')">听课足迹</a> <a class="abox" @click="toDom('tkzjDom')">听课足迹</a>
@ -38,6 +40,10 @@
<a class="abox" @click="toDom('jrkclbDom')">今日课程</a> <a class="abox" @click="toDom('jrkclbDom')">今日课程</a>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</a-col>
</a-row>
<!-- <div style="background-color: #fff;"> <!-- <div style="background-color: #fff;">
<div>&nbsp;</div> <div>&nbsp;</div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('tkzjDom')">听课足迹</a></div> <div class="topLinkTextEllipsis"><a class="abox" @click="toDom('tkzjDom')">听课足迹</a></div>

View File

@ -73,21 +73,21 @@
* 新增 * 新增
*/ */
function add() { function add() {
// getOpenId(); getOpenId();
edit({}); // edit({});
} }
function getOpenId(){ function getOpenId(){
// var STATE = window.location.search.replace('?', ''); var STATE = window.location.search.replace('?', '');
// STATE = encodeURIComponent(STATE) STATE = encodeURIComponent(STATE)
// window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?'+ window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?'+
// 'appid=214887356&redirect_uri=http://bylwcs.nenu.edu.cn/'+ 'appid=wxafdbb51ba3aa614d&redirect_uri=http://wxts.jlslxzn.com/jeecg-boot/wxpay/weixinoauth'+
// '&response_type=code&scope=snsapi_base&state='+ STATE +'#wechat_redirect' '&response_type=code&scope=snsapi_base&state='+ getUserId() +'&userid='+getUserId()+'#wechat_redirect'
let params = { userid: getUserId(), pageSize: 1 };//IDlist // let params = { userid: getUserId(), pageSize: 1 };//IDlist
defHttp.get({ url: '/KcBdgxbcopy/kcBdgxbcopy/list', params }).then(res => { // defHttp.get({ url: '/KcBdgxbcopy/kcBdgxbcopy/list', params }).then(res => {
console.log(`🚀 ~ file: baseForm.vue:77 ~ defHttp.get ~ res:`, res) // console.log(`🚀 ~ file: baseForm.vue:77 ~ defHttp.get ~ res:`, res)
total.value = res.total // total.value = res.total
}) // })
} }
/** /**
* 编辑 * 编辑

View File

@ -1,7 +1,7 @@
<template> <template>
<a-row class="rowGutter" id="tkzjDom"> <a-row class="rowGutter" id="tkzjDom">
<a-col :xs="{ span: 24 }" :sm="{ span: 12 }" :lg="{ span: 12 }" style="padding: 0 2px 0 0;"> <a-col :xs="{ span: 24 }" :sm="{ span: 12 }" :lg="{ span: 12 }" style="padding: 0 2px 0 0;">
<a-card style="height: 390px;"> <a-card style="min-height: 390px;">
<template #title> <template #title>
<span style="font-size: 24px;font-weight: bold;">听课足迹</span> <span style="font-size: 24px;font-weight: bold;">听课足迹</span>
<!-- <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="addPingJia">新增评价</a></span> --> <!-- <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="addPingJia">新增评价</a></span> -->
@ -15,7 +15,7 @@
</a-card> </a-card>
</a-col> </a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 12 }" :lg="{ span: 12 }" style="padding: 0 0 0 2px;"> <a-col :xs="{ span: 24 }" :sm="{ span: 12 }" :lg="{ span: 12 }" style="padding: 0 0 0 2px;">
<a-card style="height: 390px;"> <a-card style="min-height: 390px;">
<template #title> <template #title>
<span style="font-size: 24px;font-weight: bold;">评课足迹</span> <span style="font-size: 24px;font-weight: bold;">评课足迹</span>
<!-- <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="addPingJia">新增评价</a></span> --> <!-- <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="addPingJia">新增评价</a></span> -->

View File

@ -14,6 +14,20 @@
<div class="wenZiJiaCu"> <div class="wenZiJiaCu">
<span v-if="item.score" class="hand" style="color: #337ab7;" @click="viewModal.view(item)">已评分{{ item.score }}</span> <span v-if="item.score" class="hand" style="color: #337ab7;" @click="viewModal.view(item)">已评分{{ item.score }}</span>
<span v-else class="hand" style="color: #b77633;" @click="tingKeZuJiAddModal.view(item)"><FormOutlined/>填写评价</span> <span v-else class="hand" style="color: #b77633;" @click="tingKeZuJiAddModal.view(item)"><FormOutlined/>填写评价</span>
<span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;"></span>
<span v-if="item.source=='0'" class="hand" style="padding-left: .5rem;color: #337ab7;">课程中心</span>
<span v-else-if="item.source=='1'" class="hand" style="padding-left: .5rem;color: #337ab7;">老系统</span>
<span v-else-if="item.source=='2'" class="hand" style="padding-left: .5rem;color: #337ab7;">政务大厅</span>
<span v-else-if="item.source=='3'" class="hand" style="padding-left: .5rem;color: #337ab7;">纸质评价</span>
<span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;">--</span>
<span v-if="item.evaluationver=='1'" class="hand" style="padding-left: .5rem;color: #337ab7;">原始数据</span>
<span v-else-if="item.evaluationver=='2'" class="hand" style="padding-left: .5rem;color: #337ab7;">线上听课</span>
<span v-else-if="item.evaluationver=='3'" class="hand" style="padding-left: .5rem;color: #337ab7;">听课记录</span>
<span v-else-if="item.evaluationver=='4'" class="hand" style="padding-left: .5rem;color: #337ab7;">同行专家</span>
<span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;"></span>
<span v-if="item.suibiNotes" class="hand" style="padding-left: .5rem;color: #337ab7;"> <span v-if="item.suibiNotes" class="hand" style="padding-left: .5rem;color: #337ab7;">
<a-popover title="听课笔记"> <a-popover title="听课笔记">
<template #content> <template #content>

View File

@ -1,6 +1,6 @@
<template> <template>
<a-row class="rowGutter maxRow" :gutter="gutter"> <a-row class="rowGutter maxRow" :gutter="gutter">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 5 }"> <a-col :xs="{ span: 15 }" :sm="{ span: 8 }" :lg="{ span: 5 }">
<a-card class="cardDiv" title="今日课堂数"> <a-card class="cardDiv" title="今日课堂数">
<a-row class="" :gutter="gutter"> <a-row class="" :gutter="gutter">
<a-col :xs="{ span: 12 }" :sm="{ span: 12 }" :lg="{ span: 12 }"> <a-col :xs="{ span: 12 }" :sm="{ span: 12 }" :lg="{ span: 12 }">
@ -31,7 +31,7 @@
</div> --> </div> -->
</a-card> </a-card>
</a-col> </a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 5 }" :lg="{ span: 3 }"> <a-col :xs="{ span: 9 }" :sm="{ span: 5 }" :lg="{ span: 3 }">
<a-card class="cardDiv" title="上课中"> <a-card class="cardDiv" title="上课中">
<a-row class="" :gutter="gutter"> <a-row class="" :gutter="gutter">
<a-col :xs="{ span: 24 }" :sm="{ span: 24 }" :lg="{ span: 24 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 24 }" :lg="{ span: 24 }">
@ -81,7 +81,7 @@
</a-col> </a-col>
<!-- -- yiKaiKeTang jinRiTingKe --> <!-- -- yiKaiKeTang jinRiTingKe -->
<a-col :xs="{ span: 24 }" :sm="{ span: 9 }" :lg="{ span: 5 }"> <a-col :xs="{ span: 15 }" :sm="{ span: 9 }" :lg="{ span: 5 }">
<a-card class="cardDiv" title="今日听课"> <a-card class="cardDiv" title="今日听课">
<!-- -<i class="fa-sharp fa-solid fa-user"></i>- --> <!-- -<i class="fa-sharp fa-solid fa-user"></i>- -->
<a-row class="" :gutter="gutter"> <a-row class="" :gutter="gutter">
@ -110,7 +110,7 @@
<!-- <div class="buttomDiv"></div> --> <!-- <div class="buttomDiv"></div> -->
</a-card> </a-card>
</a-col> </a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 1 }" :lg="{ span: 2 }"> <a-col :xs="{ span: 9 }" :sm="{ span: 1 }" :lg="{ span: 2 }">
<div style="margin: 0 auto;width: fit-content;font-size: 6rem;font-weight: 700;color: #cccccc8c;padding: 29px 0;"> <div style="margin: 0 auto;width: fit-content;font-size: 6rem;font-weight: 700;color: #cccccc8c;padding: 29px 0;">
<!-- <RouterLink class="plusButton" to="/dashboard/analysis"><PlusOutlined/></RouterLink> --> <!-- <RouterLink class="plusButton" to="/dashboard/analysis"><PlusOutlined/></RouterLink> -->
<RouterLink class="plusButton" to="/dashboard/analysis">+</RouterLink> <RouterLink class="plusButton" to="/dashboard/analysis">+</RouterLink>

View File

@ -127,12 +127,13 @@ defineExpose({
.itemDate { .itemDate {
border-radius: 25px; border-radius: 25px;
background: #cccccc8c; background: #cccccc8c;
width: 70%; width: 90%;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
text-align: center; text-align: center;
margin: 0 auto .5rem; margin: 0 auto .5rem;
padding: 0.5rem; padding: 0.5rem;
font-weight: 500; font-weight: 700;
font-size: 16px;
} }
.itemBox { .itemBox {
border: 2px #eef1f2 solid; border: 2px #eef1f2 solid;

View File

@ -210,11 +210,13 @@ function funDelete(record){
.itemDate { .itemDate {
border-radius: 25px; border-radius: 25px;
background: #cccccc8c; background: #cccccc8c;
width: 70%; width: 90%;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
text-align: center; text-align: center;
margin: 0 auto .5rem; margin: 0 auto .5rem;
padding: 0.5rem; padding: 0.5rem;
font-weight: 700;
font-size: 16px;
} }
.itemBox { .itemBox {
border: 2px #eef1f2 solid; border: 2px #eef1f2 solid;