Merge branch 'develoop' of http://182.92.169.222:3000/dlsx/Teaching_integration_platform_admin_template into develoop

.env.development

@@ -1,5 +1,5 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 VITE_APP_TITLE = '无糖运营平台'
-# VITE_APP_BASE_API = 'http://127.0.0.1:8008'
+VITE_APP_BASE_API = 'http://127.0.0.1:8080'
-VITE_APP_BASE_API = 'http://39.106.16.162:8080'
+# VITE_APP_BASE_API = 'http://39.106.16.162:8080'

src/views/MyCourseStudy/learningProcess.vue

@@ -4,19 +4,26 @@ import { ref } from 'vue'
 
 import { ElMessageBox, ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
+import useUserStore from '@/store/modules/user'
+import { onMounted } from 'vue'
 //导入接口
 import { LearningRecordsControllerService } from '../../../generated/services/LearningRecordsControllerService'
 const total = ref(0)
+const userStore = useUserStore()
 const recordList = ref([])
 const selectedIds = ref([])
 const loading = ref(false)
 const showCheckbox = ref(false)
+
+onMounted(()=>{
+  userStore.getUserInfo()
+})
 const params = ref({
   // pagesize: '10',
   // pagenum: '1',
-  userId: '1',
+  userId: userStore.data.id,
 })
-
+console.log(userStore.data.id);
 //获取浏览记录列表
 const getrecordList = async () => {
   //console.log(1111111)

src/views/course/components/KnowledgeGraphUi/foldInfoUi.vue

@@ -17,7 +17,7 @@
                 <div class="my-tag">本章资源</div>
               </div>
               <button class="my-button" @click.stop="emits('edit', item)" style="margin-right: 10px;">编辑</button>
-              <el-button type="danger" class="is-el-button" :loading="loading&&item.id===activeData.id" @click.stop="hanDel(item)" style="margin-right: 10px;">删除</el-button>
+              <my-btn :id="item.id" type="danger" class="is-el-button" style="margin-right: 10px;">删除</my-btn>
             </div>
           </template>
           <template #default>
@@ -40,8 +40,9 @@
                           <div class="my-tag" type="warning">{{ obj.totalclasshours }}学时</div>
                         </div>
                         <div class="tit-box-edit">
-                          <button class="my-button" @click.stop="emits('edit', obj)" style="margin-right: 10px;">编辑</button>
+                          <button class="my-button" @click.stop="emits('edit', obj)"
-                          <el-button type="danger" class="is-el-button" :loading="loading&&obj.id==activeData.id" my-type="error" @click.stop="hanDel(obj)">删除</el-button>
+                            style="margin-right: 10px;">编辑</button>
+                            <my-btn :id="obj.id" type="danger" class="is-el-button" style="margin-right: 10px;">删除</my-btn>
                         </div>
                       </div>
                     </div>
@@ -62,13 +63,24 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ElButton } from 'element-plus';
-defineProps(['foldInfoData','loading'])
+import { ref, h, type SetupContext, withModifiers  } from 'vue'
+defineProps(['foldInfoData'])
 const emits = defineEmits(['add', 'del', 'edit'])
-const activeData = ref({id:undefined})
+
-function hanDel(o:any){
+const MyBtn = {
-  activeData.value = o
+  props: ['id'],
-  emits('del', o.id)
+  setup(props:{id:string}, context:SetupContext) {
+    const loading = ref(false)
+    const setLoading = (bool: boolean) => loading.value = bool
+    return ()=> h(ElButton, {
+      loading: loading.value,
+      onClick: withModifiers(function () { 
+        emits('del', props.id,setLoading)
+      }, ['stop']),
+      ...context.attrs,
+    }, context.slots)
+  }
 }
 </script>
 

src/views/course/courseChapters.vue

@@ -16,8 +16,7 @@
                 </div>
                 <div class="bottom">
                     <!-- 可折叠基本概念 -->
-                    <fold-info-ui :foldInfoData="foldInfoData" @add="showHide = true" @edit="hanEdit" @del="flodDel"
+                    <fold-info-ui :foldInfoData="foldInfoData" @add="showHide = true" @edit="hanEdit" @del="flodDel" />
-                        :loading="foldDelLoading" />
                     <FoldAdd v-model:is-d="showHide" v-if="showHide" :data="foldInfoData" @submit="foldAddSubmit" />
                     <FoldEdit v-model:is-d="showHide1" v-if="showHide1" :editData="activeEditData" :data="foldInfoData"
                         @submit="foldEditSubmit" />
@@ -91,9 +90,8 @@ function foldAddSubmit(data: any, updLoading: Function) {
     }).finally(() => updLoading(false))
 }
 //删除章节
-const foldDelLoading = ref(false)
+function flodDel(id: string,setLoading:Function) {
-function flodDel(id: string) {
+    setLoading(true)
-    foldDelLoading.value = true
     deleteSectionApi(id).then(() => {
         ElMessage({
             message: `删除成功`,
@@ -105,7 +103,7 @@ function flodDel(id: string) {
             message: `删除失败`,
             type: 'error'
         })
-    }).finally(() => foldDelLoading.value = false)
+    }).finally(() =>setLoading(false))
 }
 // 更新章节
 const showHide1 = ref(false)

src/views/courseResources/componse/resourceAdd.vue

@@ -3,23 +3,37 @@ import { ref } from 'vue'
 const visibilerDrawer = ref(false)
 import { ElMessage } from 'element-plus'
 import { CourseResourceControllerService } from '../../../../generated/services/CourseResourceControllerService'
+import tool from '@/utils/oss.js'
+import { id } from 'element-plus/es/locales.mjs';
 //默认数据
 const defaultForm = {
   description: '',
-  id: '',
+  id:'',
   img: '', //封面
   name: '',
   type: '', //资源类型
   path: '',
 }
 const imageUrl = ref('')
-const onSelectFile = (uploadFile) => {
+//上传阿里云oss
-  // console.log(uploadFile)
+const upload = async (option) =>{
   //预览图片
-  imageUrl.value = URL.createObjectURL(uploadFile.raw)
+  imageUrl.value = URL.createObjectURL(option.raw)
-  //将图片存入
+  const res = await tool.oss.upload(option.raw);//将图片存入阿里云
-  formModel.value.img = uploadFile.raw
+  const url = "https://wenyu132.oss-cn-beijing.aliyuncs.com/" + res.name;//获取到存入阿里云后的url
+  console.log(url);
+  //将url赋值给要上传后端的参数里
+  formModel.value.img = url
 }
+
+
+// const onSelectFile = (uploadFile) => {
+//   // console.log(uploadFile)
+//   //预览图片
+//   imageUrl.value = URL.createObjectURL(uploadFile.raw)
+//   //将图片存入
+//   formModel.value.img = uploadFile.raw
+// }
 //准备数据
 
 const formModel = ref({
@@ -184,7 +198,7 @@ defineExpose({
           :show-file-list="false"
           :auto-upload="false"
           :before-upload="beforeAvatarUpload"
-          :on-change="onSelectFile"
+          :on-change="upload"
         >
           <img v-if="imageUrl" :src="imageUrl" class="avatar" />
           <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>

src/views/courseResources/index.vue

@@ -14,6 +14,9 @@ import { LearningRecordsControllerService } from '../../../generated/services/Le
 import { CourseResourceControllerService } from '../../../generated/services/CourseResourceControllerService'
 
 import resourceAdd from './componse/resourceAdd.vue'
+import useUserStore from '@/store/modules/user'
+import { onMounted } from 'vue'
+
 
 const total = ref(0)
 const pptresourceList = ref([])
@@ -77,20 +80,25 @@ const onDeleteResource = async (ids) => {
   ElMessage({ type: 'success', message: '删除成功' })
   getpptresourceList()
 }
-
+const userStore = useUserStore()
+onMounted(()=>{
+  userStore.getUserInfo()
+})
 const param = ref({
   coursesId: '',
-  userId: '1',
+  coursesName: '',
+  userId: userStore.data.id,
   open: '1',
   download: '0',
   content: '',
   address: '/portal',
-  type: '1',
+  type: '4',
 })
 //点击生成浏览记录
 const generateRecords = async (rescource) => {
   param.value.content = rescource.img
   param.value.coursesId = rescource.id.toString()
+  param.value.coursesName = rescource.name
   await LearningRecordsControllerService.saveRecordsUsingPost1(param.value)
   // console.log(param)
 }