diff --git a/src/views/kc/detection/zyZhjsList.vue b/src/views/kc/detection/zyZhjsList.vue index f190367..2990f45 100644 --- a/src/views/kc/detection/zyZhjsList.vue +++ b/src/views/kc/detection/zyZhjsList.vue @@ -3,11 +3,11 @@
- + @@ -69,11 +69,14 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcDe import { downloadFile } from '/@/utils/common/renderUtils'; import { JDictSelectTag, JInput } from '/@/components/Form'; import { useRouter } from 'vue-router'; + //用户相关 + import { useUserStore } from '/@/store/modules/user'; + const userStore = useUserStore(); const { currentRoute } = useRouter(); const { query } = unref(currentRoute); const { rwbh,xqxn } = query;//获取传递参数 const checkedKeys = ref>([]); -const queryParam = ref({ rwbh }); +const queryParam = ref({ rwbh,skjs:userStore?.getUserInfo?.realname }); const labelCol = reactive({ xs: { span: 24 }, diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue index e6893ee..eacbb91 100644 --- a/src/views/kc/wjxCswj/WjxCswjList.vue +++ b/src/views/kc/wjxCswj/WjxCswjList.vue @@ -60,10 +60,10 @@ - 设置试卷 - 发布试卷 - 删除试卷 - 编辑题目 + 设置测验 + 修改题目 + 发布测验 + 删除测验 预览题目 测验详情 预览题目 diff --git a/src/views/kc/wjxCswj/WjxCswjMainList.vue b/src/views/kc/wjxCswj/WjxCswjMainList.vue index 8ce5dee..61c8581 100644 --- a/src/views/kc/wjxCswj/WjxCswjMainList.vue +++ b/src/views/kc/wjxCswj/WjxCswjMainList.vue @@ -1,7 +1,7 @@ @@ -63,14 +66,17 @@ [多选] @@ -100,14 +106,17 @@ [填空] @@ -160,7 +169,6 @@ function addTigan(type){ var list = tiganData.value; if(type==3){ var chk = ""; - console.log(`🚀 ~ addTigan ~ isShow:`, isShow) if(isShow.value){ chk = "1"; } @@ -172,6 +180,7 @@ function addTigan(type){ wjScore:null, wjLeixing, itemSelected:chk, + wjSfqh:'0', wjxWjxxTmxxList:[{itemTitle:null,itemIndex:'1'},{itemTitle:null,itemIndex:'2'}], } list.push(params); @@ -190,6 +199,7 @@ function addTigan(type){ wjScore:null, wjLeixing, itemSelected:chk, + wjSfqh:'0', wjxWjxxTmxxList:[{itemTitle:null,itemIndex:'1'},{itemTitle:null,itemIndex:'2'}], } list.push(params); @@ -203,12 +213,18 @@ function addTigan(type){ wjScore:null, wjLeixing, wjAnswer:null, + wjSfqh:'0', } list.push(params); tiganData.value = [...list]; } } +function handleQiehuan(record,type){ + console.log(`🚀 ~ handleQiehuan ~ type:`, type) + console.log(`🚀 ~ handleQiehuan ~ record:`, record) + record.wjSfqh=type +} function cheGrp(a,b){ var retChe = false; @@ -260,7 +276,6 @@ function handleYylx(sylx){ } //引用题库回调 function handleYytkSuccess(record){ -console.log(`🚀 ~ handleYytkSuccess ~ record:`, record) for(var i=0;i - +
{{getSysConfig().bmdTitle}}
- + @@ -103,7 +103,7 @@ import pjjgPage from '/@/views/site/pjjgPage/index.vue'; - import { getUserSf,getSysConfig } from '/@/views/site/utils/index'; + import { getUserSf,getSysConfig,getUserInfo } from '/@/views/site/utils/index'; import { defHttp } from '/@/utils/http/axios'; // const headerPage = () => import('/@/views/site/common/header.vue'); @@ -135,6 +135,8 @@ const maxClassName = ref({}); const zzskTitle = ref('正在上课'); const queryParam = ref({}); + + const sfxx = ref('0'); const jclist = (queryParam) => defHttp.get({ url: '/kcJieci/kcJieci/getIndexJcList', params:queryParam }); // 实时计算浏览器的宽度 @@ -166,6 +168,19 @@ // maxClassName.value = {width:width+"px"} // } + let roleList = getUserInfo().roleList; + if(roleList){ + for(var i=0;i{ var list = res let sjsksj = list[0].sjsksj diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue index 29aa264..c76ca8c 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue @@ -1,269 +1,378 @@ diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue index f49abca..34f817f 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue @@ -113,8 +113,8 @@ import dqxqkc from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue'; const maxClassName = ref({}); - const selectedKeys = ref(['1']); - const openKeys = ref(['sub1']); + const selectedKeys = ref(['sub0']); + const openKeys = ref(['sub0']); //当前路由信息 const { currentRoute } = useRouter(); const { query } = unref(currentRoute); diff --git a/src/views/site/studentWdkc/studentZyxx.vue b/src/views/site/studentWdkc/studentZyxx.vue index adf3a5e..85539ce 100644 --- a/src/views/site/studentWdkc/studentZyxx.vue +++ b/src/views/site/studentWdkc/studentZyxx.vue @@ -4,7 +4,7 @@
课程简介： - {{jxdgInfo.kcjs}} +
@@ -46,7 +46,7 @@ {{(current-1)*pageSize+index+1}}.{{item.question}} - 答：{{item.answer}} + 答：
 @@ -72,7 +72,7 @@ diff --git a/src/views/site/studentWdkc/studentZyxxModal.vue b/src/views/site/studentWdkc/studentZyxxModal.vue index cc4b4bc..249f504 100644 --- a/src/views/site/studentWdkc/studentZyxxModal.vue +++ b/src/views/site/studentWdkc/studentZyxxModal.vue @@ -23,9 +23,9 @@ function edit(record) { title.value = '预览'; visible.value = true; - // nextTick(() => { - // registerForm.value.edit(record); - // }); + nextTick(() => { + registerForm.value.edit(record); + }); } /** diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue index e7f527e..a6e5fc6 100644 --- a/src/views/system/loginmini/MiniLogin.vue +++ b/src/views/system/loginmini/MiniLogin.vue @@ -33,7 +33,7 @@ >{{ t('sys.login.mobileSignInFormTitle') }}
--> -
+
@@ -72,7 +78,7 @@