diff --git a/src/router/routes/modules/stuzy/stuzy.ts b/src/router/routes/modules/stuzy/stuzy.ts index 626fcd8..219104f 100644 --- a/src/router/routes/modules/stuzy/stuzy.ts +++ b/src/router/routes/modules/stuzy/stuzy.ts @@ -75,7 +75,7 @@ const stuzy: AppRouteModule = { name: 'stuTlq', component: () => import('/@/views/zy/zyTlq/StuZyTlqList.vue'), meta: { - title: '通知公告', + title: '讨论区', }, }, diff --git a/src/router/routes/modules/zy/zy.ts b/src/router/routes/modules/zy/zy.ts index a454f52..5540381 100644 --- a/src/router/routes/modules/zy/zy.ts +++ b/src/router/routes/modules/zy/zy.ts @@ -20,7 +20,7 @@ const zuoye: AppRouteModule = { meta: { title: '作业管理', }, - component: () => import('/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue'), + component: () => import('/@/views/zy/zyGonggao/ZyGonggaoList.vue'), }, { path: 'dqkcDetail', diff --git a/src/views/kc/detection/components/KcDetectionMainModal.vue b/src/views/kc/detection/components/KcDetectionMainModal.vue index ea49918..50efa01 100644 --- a/src/views/kc/detection/components/KcDetectionMainModal.vue +++ b/src/views/kc/detection/components/KcDetectionMainModal.vue @@ -1,6 +1,6 @@ @@ -29,6 +57,7 @@ import { saveOrUpdate } from '../KcDetectionMain.api'; // Emits声明 const emit = defineEmits(['register', 'success']); const isUpdate = ref(true); +const form = ref({}); //表单配置 const [registerForm, { setProps, getFieldsValue, resetFields, setFieldsValue, validate }] = useForm({ //labelWidth: 150, @@ -38,21 +67,36 @@ const [registerForm, { setProps, getFieldsValue, resetFields, setFieldsValue, va }); //表单赋值 const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { + console.log(`🚀 ~ 11111111111111 ~ data:`, data) + + form.value = data.record; + form.value.hh = data.record.ketangbiaoInfo.hh; + form.value.hh = data.record.ketangbiaoInfo.xkrs; + console.log(`🚀 ~ const[registerModal,{setModalProps,closeModal}]=useModalInner ~ form:`, form) + + form.value.detectionDetailedList.forEach(item => { + item.ketangbiaoInfo = data.record.ketangbiaoInfo; + }) + + + + //重置表单 await resetFields(); setModalProps({ confirmLoading: false, showCancelBtn: !!data?.showFooter, showOkBtn: !!data?.showFooter }); isUpdate.value = !!data?.isUpdate; - if (unref(isUpdate)) { - //表单赋值 - await setFieldsValue({ - ...data.record, - }); - } + // if (unref(isUpdate)) { + // form.value = data.record; + // //表单赋值 + // await setFieldsValue({ + // ...data.record, + // }); + // } // 隐藏底部时禁用整个表单 setProps({ disabled: !data?.showFooter }) }); //设置标题 -const title = computed(() => '查看'); +const title = computed(() => 'AI识别出勤情况'); //表单提交事件 async function handleSubmit(v) { try { @@ -70,7 +114,7 @@ async function handleSubmit(v) { } function calcAverageNum(record){ - let xkrs = getFieldsValue('ketangbiaoInfo')?.ketangbiaoInfo?.xkrs; + let xkrs = record?.ketangbiaoInfo?.xkrs; let { num: averageNum } = record; let xkrsNum = Number(xkrs); if(!isNaN(xkrsNum) && xkrsNum != 0 && averageNum != 0) { diff --git a/src/views/kc/kcWechatSendLog/KcWechatSendLog.data.ts b/src/views/kc/kcWechatSendLog/KcWechatSendLog.data.ts index ab269f4..734cd8a 100644 --- a/src/views/kc/kcWechatSendLog/KcWechatSendLog.data.ts +++ b/src/views/kc/kcWechatSendLog/KcWechatSendLog.data.ts @@ -10,15 +10,15 @@ export const columns: BasicColumn[] = [ dataIndex: 'createTime' }, { - title: '教师姓名', + title: '工号', + align: "center", + dataIndex: 'openid' + }, + { + title: '姓名', align: "center", dataIndex: 'teacherName' }, - // { - // title: '学期学年', - // align: "center", - // dataIndex: 'xqxn' - // }, { title: '发送内容', align: "center", @@ -29,11 +29,11 @@ export const columns: BasicColumn[] = [ // align: "center", // dataIndex: 'sjtkcs' // }, - { - title: '发送结果', - align: "center", - dataIndex: 'remark' - }, + // { + // title: '发送结果', + // align: "center", + // dataIndex: 'remark' + // }, ]; //查询数据 diff --git a/src/views/kc/kcWechatSendLog/KcWechatSendLogList.vue b/src/views/kc/kcWechatSendLog/KcWechatSendLogList.vue index 6c39423..9e946b8 100644 --- a/src/views/kc/kcWechatSendLog/KcWechatSendLogList.vue +++ b/src/views/kc/kcWechatSendLog/KcWechatSendLogList.vue @@ -4,17 +4,22 @@
- - - + + + - + + + + + + + 查询 @@ -80,6 +85,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcWechatSendLog.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import KcWechatSendLogModal from './components/KcWechatSendLogModal.vue' + import { JInput } from '/@/components/Form'; const queryParam = ref({}); const toggleSearchStatus = ref(false); diff --git a/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue b/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue index 95f7953..34c1df5 100644 --- a/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue +++ b/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue @@ -2,14 +2,14 @@ - - - + + + + + + + + 暂无数据 -
+
{{item.username}},听了 {{item.kkdw}} 的课程。 @@ -24,7 +26,29 @@
- + + + + 暂无数据 + +
+
+
+ {{item.logContent}} +

{{item.createTime}}

+
+ +
+
+
+ 统计 +
+ + + + + +
@@ -33,6 +57,10 @@ import { ref, reactive, onMounted } from 'vue'; import { defHttp } from '/@/utils/http/axios'; import { getSysConfig } from '/@/views/site/utils/index'; +import BlLoginLogModal from '/@/views/kc/blLoginLog/BlLoginLogModal.vue' + + + enum Api { list = '/kcTingke/kcTingke/getHtindexTkmxlist', } @@ -41,16 +69,20 @@ const list = (params) => defHttp.get({ url: Api.list, params }); const queryParam = ref({}); let listData = ref([]); +let listLogData = ref([]); let lslist = ref([]); let pageKs = ref(0); let pageJs = ref(5); let pageNo = ref(1); +let activeKey = ref('1'); +const BlLoginLogModalPage = ref(); //进入就加载 onMounted(() => { queryParam.value.skrq = getSysConfig().bxqkssj queryParam.value.pageKs = pageKs.value queryParam.value.pageJs = pageJs.value - loadData() + loadData(); + loadLogData(); }); function funMore(){ let djy = pageNo.value @@ -59,6 +91,12 @@ function funMore(){ console.log(`🚀 ~ file: zxdt.vue:55 ~ funMore ~ queryParam:`, queryParam) loadData() } + +function handlLoginLog(){ + BlLoginLogModalPage.value.disableSubmit = true; + BlLoginLogModalPage.value.add(); +} + function loadData(){ list(queryParam.value).then(res => { lslist = res @@ -72,6 +110,13 @@ function loadData(){ console.log(`🚀 ~ file: zxdt.vue:43 ~ list ~ listData:`, listData) }) } + +function loadLogData(){ + defHttp.get({url:'/blLoginLog/blLoginLog/list',params:{pageNo:1,pageSize:5}}).then(res=>{ + console.log(`🚀 ~ defHttp.get ~ res:`, res.records) + listLogData.value = res.records; + }) +} diff --git a/src/views/site/renKeJiaoCheng/index.vue b/src/views/site/renKeJiaoCheng/index.vue index 38991be..834cc88 100644 --- a/src/views/site/renKeJiaoCheng/index.vue +++ b/src/views/site/renKeJiaoCheng/index.vue @@ -115,7 +115,7 @@ function openKecheng(item){ function openDetailKecheng(item){ console.log(`🚀 ~ openDetailKecheng ~ item:`, item) - window.open('/zy/dqkcDetail?rwbh='+item.rwbh+'&xqxn='+getSysConfig().flag1+"&type=1","_blank"); + window.open('/zy/main?rwbh='+item.rwbh+'&xqxn='+getSysConfig().flag1+"&type=1","_blank"); } async function getTeacherzzsk() { diff --git a/src/views/site/studentWdkc/studentMain.vue b/src/views/site/studentWdkc/studentMain.vue index 34533f5..62ffb11 100644 --- a/src/views/site/studentWdkc/studentMain.vue +++ b/src/views/site/studentWdkc/studentMain.vue @@ -5,14 +5,28 @@ -
课程名称：{{kcxxInfo.kcmc}}
+ + +
课程名称：{{kcxxInfo.kcmc}}
+ + + + + - + - + + + diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue index 6b1b6a2..41ddf62 100644 --- a/src/views/site/studentWdkc/studentMenu.vue +++ b/src/views/site/studentWdkc/studentMenu.vue @@ -1,16 +1,19 @@ @@ -45,6 +84,7 @@ import headerPage from '/@/views/site/common/header.vue'; import footerPage from '/@/views/site/common/footer.vue'; import dqxqkc from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue'; + import { MailOutlined, AppstoreOutlined, SettingOutlined,MenuUnfoldOutlined } from '@ant-design/icons-vue'; const maxClassName = ref({}); const selectedKeys = ref([]); @@ -92,7 +132,6 @@ #maxSite { //最大宽度 max-width: 1070px; - min-height: 750px; //居中 margin: 0 auto; .rowGutter{ @@ -121,4 +160,7 @@ } } } +.ant-menu-overflow { + flex-direction: row-reverse +} diff --git a/src/views/site/studentWdkc/studentWdkc.vue b/src/views/site/studentWdkc/studentWdkc.vue index a769f78..35eaae5 100644 --- a/src/views/site/studentWdkc/studentWdkc.vue +++ b/src/views/site/studentWdkc/studentWdkc.vue @@ -59,7 +59,7 @@ function openKecheng(record){ defHttp.post({ url: '/zyDbtx/zyDbtx/deleteByRwbhCreate',params:{rwbh:record.rwbh,fbr:record.jgh} }).then((res) => { loaddata() }); - var url = "/stuzy/studentMain?rwbh="+record.rwbh+"&xqxn="+record.xqxn+"&teano="+record.jgh; + var url = "/stuzy/StudentGonggaoList?rwbh="+record.rwbh+"&xqxn="+record.xqxn+"&teano="+record.jgh; window.open(url,'_blank') } diff --git a/src/views/zy/zyGonggao/StudentGonggaoList.vue b/src/views/zy/zyGonggao/StudentGonggaoList.vue index 643c611..273b9a5 100644 --- a/src/views/zy/zyGonggao/StudentGonggaoList.vue +++ b/src/views/zy/zyGonggao/StudentGonggaoList.vue @@ -22,8 +22,8 @@
- - + + @@ -77,7 +77,7 @@ xs: { span: 24 }, sm: { span: 16 }, }); - + let activeKey = ref(['0','1','2','3','4','5','6','7','8','9']); /** * 查询 @@ -118,6 +118,11 @@ defHttp.get({ url: '/zyGonggao/zyGonggao/list', params: queryParam.value }).then((res) => { console.log(res); dataSource.value = res.records; + for(var i=0;i