Compare commits

..

No commits in common. '0a72ffefaf3e6dc35124e2206f63912fac064c0e' and 'f5c734a039c7a8a3db7bfc3f0beb5b01e5717d4b' have entirely different histories.

  1. 16
      src/api/user.ts
  2. 51
      src/layout/knowledgePage.vue
  3. 18
      src/layout/spacePage.vue

@ -23,19 +23,3 @@ export const sturegister = (data: any) => {
data, data,
}) })
} }
// 获取用户信息
export const getUserInfoService = () => {
return request({
url: "/xnRecords/getIndividualScore",
method: "get",
});
};
//获取知识点信息
export const getKnowledgeService = () => {
return request({
url: "knowledgepoint/xnKnowledgePoint/list",
method: "get",
});
};

@ -8,11 +8,11 @@
<!-- 左边按钮 --> <!-- 左边按钮 -->
<button class="submit-left" @click="SubLeft"></button> <button class="submit-left" @click="SubLeft"></button>
<div class="question-body"> <div class="question-body">
<div class="sumTotal"><span>{{currentKnowledgeIndex+1}}</span>/{{Knowledges .length}}</div> <div class="sumTotal">一个/共X</div>
<div class="question">{{currentKnowledgeTitle}}</div> <div class="question">知识点学习</div>
<el-scrollbar height="210px"> <el-scrollbar height="210px">
<div class="txt" v-html="currentKnowledge"></div> <div class="txt" v-html="Text"></div>
</el-scrollbar> </el-scrollbar>
<div class="finished">已学习</div> <div class="finished">已学习</div>
</div> </div>
@ -26,51 +26,32 @@
</div> </div>
</template> </template>
<script lang="ts" setup name="knowledgePage"> <script lang="ts" setup>
import settingStore from "@/store/modules/setting"; import settingStore from "@/store/modules/setting";
import { ref, computed, onMounted, } from "vue" import { getExperiment } from '@/api/index'
import { ElMessage } from 'element-plus' import { ref, computed, onMounted, onUnmounted } from "vue"
import {getKnowledgeService } from '@/api/user' import { useRouter } from 'vue-router';
const setting = settingStore(); const setting = settingStore();
// //
const SubLeft = () => { const SubLeft = () => {
console.log(currentKnowledgeIndex.value)
if(currentKnowledgeIndex.value >= 1){
currentKnowledgeIndex.value = currentKnowledgeIndex.value - 1
}else{
ElMessage.warning('无法上翻')
}
} }
// //
const SubRight = () => { const SubRight = () => {
} }
const Knowledges = ref<any[]>([]); const Text = ref()
const getKnowledge = async () => { const getContent = async () => {
const res: any = await getKnowledgeService(); const res: any = await getExperiment();
Knowledges.value = res.result.records // console.log(res.result.purposeRequirements,'res')
// console.log(Knowledges.value,'ress') Text.value = res.result.purposeRequirements
console.log(Text.value);
} }
//
const currentKnowledgeIndex = ref(0);
const currentKnowledge = computed(() => {
// questions.value
if (Knowledges.value.length > 0) {
return Knowledges.value[currentKnowledgeIndex.value].knowledgeContext;
}
return '';
});
const currentKnowledgeTitle = computed(() => {
// questions.value
if (Knowledges.value.length > 0) {
return Knowledges.value[currentKnowledgeIndex.value].knowledgeName;
} onMounted(() => { getContent() });
return '';
});
onMounted(() => { getKnowledge() });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

@ -43,7 +43,7 @@
班级 班级
</div> </div>
<div class="right"> <div class="right">
<el-input v-model="formModel.className" style="border-color: #20bec8;"></el-input> <el-input v-model="formModel.clssid" style="border-color: #20bec8;"></el-input>
</div> </div>
</el-form-item> </el-form-item>
@ -57,7 +57,7 @@
学号 学号
</div> </div>
<div class="right"> <div class="right">
<el-input v-model="formModel.workNo" <el-input v-model="formModel.studentNumb"
style="border-color: #20bec8"></el-input> style="border-color: #20bec8"></el-input>
</div> </div>
</div> </div>
@ -99,7 +99,7 @@ import { useRouter } from 'vue-router'
import settingStore from "@/store/modules/setting"; import settingStore from "@/store/modules/setting";
const setting = settingStore(); const setting = settingStore();
import userStore from '@/store/modules/user'; import userStore from '@/store/modules/user';
import { getUserInfoService } from '@/api/user' import { getUserInfo } from "@/api";
const router = useRouter() const router = useRouter()
const user = userStore(); const user = userStore();
const loginFn = () => { const loginFn = () => {
@ -120,17 +120,15 @@ const formRef = ref();
const formModel = ref({ const formModel = ref({
username: "", username: "",
realname: "", realname: "",
className: '', clssid: '',
workNo: "", studentNumb: "",
phone: '', phone: '',
score: '' score: ''
}); });
const getUser=async()=>{ const getUser=async()=>{
const res: any = await getUserInfoService(); const res: any = await getUserInfo();
// console.log(res.result,'aaaaa'); formModel.value = res.result.userInfo;
console.log(formModel, 'formModel');
formModel.value = res.result;
// console.log(formModel, 'formModel');
} }

Loading…
Cancel
Save