From a052af97dd7f11e4c86fccaa893ad37bbe67d0d0 Mon Sep 17 00:00:00 2001
From: ww <ww.cn>
Date: Wed, 19 Jun 2024 13:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Teaching_integration_platform_admin_template | 1 -
 mock/user.ts                                 | 5 +----
 src/views/course/CourseObjectives.vue        | 2 +-
 src/views/home/components/Echart/Echarts.vue | 2 +-
 src/views/home/components/Status.vue         | 3 +--
 src/views/login/index.vue                    | 2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 160000 Teaching_integration_platform_admin_template

diff --git a/Teaching_integration_platform_admin_template b/Teaching_integration_platform_admin_template
deleted file mode 160000
index be31783..0000000
--- a/Teaching_integration_platform_admin_template
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit be31783972a0cdd8d1abfe03df8ef24a73854b0c
diff --git a/mock/user.ts b/mock/user.ts
index 14079f0..a0fc418 100644
--- a/mock/user.ts
+++ b/mock/user.ts
@@ -10,7 +10,6 @@ function createUserList() {
       desc: '平台管理员',
       roles: ['平台管理员'],
       buttons: ['cuser.detail'],
-<<<<<<< HEAD
       routes: [
         'Home',
         'Course',
@@ -22,10 +21,8 @@ function createUserList() {
         'CourseChapters',
         'KnowledgePoints',
         'CurriculumMap',
+        'knowledgeAtlas',
       ], //老师权限
-=======
-      routes: ['Home', 'Course', 'Student', 'Group', 'Message','BasicCourseInformation','CourseObjectives','CourseChapters','KnowledgePoints','CurriculumMap','knowledgeAtlas'], //老师权限
->>>>>>> c410b660ea058afeb8db74ec244fc38f8928cf30
       token: 'Admin Token',
     },
     {
diff --git a/src/views/course/CourseObjectives.vue b/src/views/course/CourseObjectives.vue
index 2a660ac..11ecde0 100644
--- a/src/views/course/CourseObjectives.vue
+++ b/src/views/course/CourseObjectives.vue
@@ -31,7 +31,7 @@ import {} from 'vue'
   </el-row>
 </template>
 
-<style>
+<style scoped>
 .el-row {
   margin-bottom: 20px;
 }
diff --git a/src/views/home/components/Echart/Echarts.vue b/src/views/home/components/Echart/Echarts.vue
index c39be74..44e5f0b 100644
--- a/src/views/home/components/Echart/Echarts.vue
+++ b/src/views/home/components/Echart/Echarts.vue
@@ -95,7 +95,7 @@ onMounted(() => {
 <template>
   <div ref="echarsDom" class="main"></div>
 </template>
-<style>
+<style scoped>
 .main {
   width: 766px;
   height: 352px;
diff --git a/src/views/home/components/Status.vue b/src/views/home/components/Status.vue
index aee3a41..e85f457 100644
--- a/src/views/home/components/Status.vue
+++ b/src/views/home/components/Status.vue
@@ -70,7 +70,7 @@ const upload = async (option) => {
 //修改用户信息
 const changeInfo = async () => {
   const userInfo = {
-    username: form.value.username,
+    // username: form.value.username,
     phone: form.value.phone,
     id: form.value.id,
     nickName: form.value.nickName,
@@ -109,7 +109,6 @@ const changeInfo = async () => {
       <el-form-item label="用户名" :label-width="formLabelWidth">
         <el-input v-model="form.username" autocomplete="off" />
       </el-form-item>
-
       <el-form-item label="昵称" :label-width="formLabelWidth">
         <el-input v-model="form.nickName" autocomplete="off" />
       </el-form-item>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 28911ae..b8d8bbd 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -300,7 +300,7 @@ import {
   userRegisterService,
   userPhoneRegisterService,
   userCodeRegisterService,
-} from '@/api/user/user.js'
+} from '@/api/user/user'
 // let loginForm = reactive({ username: 'admin', password: '111111' })
 // 引入登录仓库
 let userStore = useUserStore()