diff --git a/src/main/index.js b/src/main/index.js
index c90837e..7b93dc0 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -61,10 +61,12 @@ function createLoginWindow() {
 function createMainWindow() {
   mainWindow = new BrowserWindow({
     width: 1200,
+    minWidth: 1200,
     height: 700,
     show: false,
     frame: false, // 无边框
     autoHideMenuBar: true,
+    maximizable: false,
     icon: join(__dirname, '../../resources/logo2.ico'),
     ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {
diff --git a/src/renderer/src/api/system/user.js b/src/renderer/src/api/system/user.js
index b7e9e23..f8b74f0 100644
--- a/src/renderer/src/api/system/user.js
+++ b/src/renderer/src/api/system/user.js
@@ -50,3 +50,9 @@ export function updateUserInfo(data) {
     data: data
   })
 }
+export function getUserInfo(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'get'
+  })
+}
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 9c02172..3c2f6a5 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -46,7 +46,7 @@ import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
 import useUserStore from '@/store/modules/user'
 import { listEvaluation } from '@/api/subject'
 
-const BaseUrl = 'https://prev.ysaix.com:7868/'
+const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
 // 定义要发送的emit事件
 const emit = defineEmits(['nodeClick', 'changeBook'])
 // store
diff --git a/src/renderer/src/components/select-subject/index.vue b/src/renderer/src/components/select-subject/index.vue
index 52f306a..4c7cd97 100644
--- a/src/renderer/src/components/select-subject/index.vue
+++ b/src/renderer/src/components/select-subject/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="500"  
+  <el-dialog v-model="model" append-to-body :show-close="false" width="500"  
   top="25vh"
   :close-on-click-modal="false"
   :close-on-press-escape="false"
@@ -34,12 +34,14 @@
 
 <script setup>
 import { ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
 import { listEvaluation } from '@/api/subject'
 import { updateUserInfo } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 
 const userStore = useUserStore()
 const { userId, userName } = userStore.user
+const { ipcRenderer } = window.electron || {}
 
 const props = defineProps({
   loginData: {
@@ -48,17 +50,11 @@ const props = defineProps({
       return {}
     }
   },
-  modelValue: {
-    type: Boolean,
-    default: false
-  },
 })
 
+const model = defineModel();
 const subjectLoading = ref(false)
-
-// 定义要发送的emit事件
-const emit = defineEmits(['update:modelValue', 'onSuccess'])
-
+// 默认学段 前端写死 参照web AIx
 const gradeList = ref([
   {
     label: '高中',
@@ -85,7 +81,6 @@ gradeVal.value = gradeList.value[0].value
 //学科列表数据
 const subjectList = ref([])
 const allSubject = ref([])
-const dialogVisible = ref(false)
 
 //切换年级
 const changeGrade = ()=>{
@@ -98,8 +93,8 @@ const changeGrade = ()=>{
   // 默认选中第一个学科
   subjectVal.value = subjectList.value[0].itemtitle
 }
-// 获取学科数据
 
+// 获取学科数据
 const getSubject = async ()=>{
   const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
   // 所有学科
@@ -119,7 +114,6 @@ const editUserInfo = async () =>{
     edustage: gradeVal.value,
     edusubject:  subjectVal.value
   }
-
   // 修改之后需要重新登录 查询用户信息，否则不登录 查询的用户信息是未修改之前的
   // 接口如此，我也不知道为啥要这样
   subjectLoading.value = true
@@ -128,14 +122,15 @@ const editUserInfo = async () =>{
     await updateUserInfo(data)
     await userStore.login(props.loginData)
     await userStore.getInfo()
+    ElMessage.success('登录成功')
+    model.value = false
+    ipcRenderer && ipcRenderer.send('openMainWindow')
   } finally {
     subjectLoading.value = false
   }
-  emit('onSuccess')
 }
 
-watch(() => props.modelValue, (newVal) => {
-  dialogVisible.value = newVal
+watch(() => model.value, (newVal) => {
   if(newVal){
     getSubject()
   }
diff --git a/src/renderer/src/hooks/useGetHomework.js b/src/renderer/src/hooks/useGetHomework.js
index c881f94..ebdabf3 100644
--- a/src/renderer/src/hooks/useGetHomework.js
+++ b/src/renderer/src/hooks/useGetHomework.js
@@ -11,6 +11,7 @@ let chapterId = null
 export const useGetHomework = async (node) => {
   /**
    * node
+   * 左侧选择章节的节点数据
    */
   if (!node) return
   curNode = node
@@ -26,7 +27,10 @@ export const useGetHomework = async (node) => {
     chapterId = rows[0].id
   }
 
-  return await getHomeWorkList()
+  return new Promise(async (resolve) =>{
+    const res = await getHomeWorkList()
+    resolve({res,chapterId})
+  })
  
 
 }
diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index 799bf33..7f5ecea 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -29,7 +29,7 @@
             @command="handleCommand"
           >
             <div class="avatar-wrapper">
-              <img :src="userStore.user.avatar" class="user-avatar" style="float: left" />
+              <img :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left" />
               <div style="margin-top: 18px; font-size: 0.8em">{{ userStore.user.nickName }}</div>
             </div>
             <template #dropdown>
@@ -62,6 +62,7 @@ const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
 const router = useRouter()
 const currentRoute = ref('')
+const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 
 const handleOutLink = (path, type) => {
   if (!path) return
diff --git a/src/renderer/src/store/modules/user.js b/src/renderer/src/store/modules/user.js
index 3878eb7..3a45327 100644
--- a/src/renderer/src/store/modules/user.js
+++ b/src/renderer/src/store/modules/user.js
@@ -37,7 +37,7 @@ const useUserStore = defineStore('user', {
       return new Promise((resolve, reject) => {
         getInfo()
           .then((res) => {
-            res.user.avatar = import.meta.env.VITE_APP_BASE_API + res.user.avatar
+            // res.user.avatar = import.meta.env.VITE_APP_BASE_API + res.user.avatar
             const user = res.user
             this.user = user
             const avatar = user.avatar == '' || user.avatar == null ? defAva : user.avatar
diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue
index 2828429..b11d241 100644
--- a/src/renderer/src/views/login/index.vue
+++ b/src/renderer/src/views/login/index.vue
@@ -47,7 +47,7 @@
     />
   </el-dialog>
   <!--选择学科-->
-  <SelectSubject v-model="isSubject" :login-data="loginForm" @on-success="successEditSubject" />
+  <SelectSubject v-model="isSubject" :login-data="loginForm" />
 </template>
 <script setup>
 import { onMounted, reactive, ref } from 'vue'
@@ -121,12 +121,6 @@ const submitForm = async (formEl) => {
   })
 }
 
-const successEditSubject = () => {
-  isSubject.value = false
-  ElMessage.success('登录成功')
-  ipcRenderer && ipcRenderer.send('openMainWindow')
-}
-
 const getCookie = async () => {
   const username = (await getCookieDetail('username'))[0]
   const password = (await getCookieDetail('password'))[0]
diff --git a/src/renderer/src/views/prepare/container/set-homework.vue b/src/renderer/src/views/prepare/container/set-homework.vue
index c607e43..5aa5d35 100644
--- a/src/renderer/src/views/prepare/container/set-homework.vue
+++ b/src/renderer/src/views/prepare/container/set-homework.vue
@@ -263,9 +263,15 @@ export default {
     getCurrentDate() {
       const now = new Date();
       const year = now.getFullYear();
-      const month = now.getMonth() + 1; // 月份是从0开始的，所以需要+1
-      const day = now.getDate()
-      return `${year}-${month.length == 2 ? month : '0' + month}-${day.length == 2 ? day : '0' + day}`;
+      let month = now.getMonth() + 1; // 月份是从0开始的，所以需要+1
+      let day = now.getDate()
+      if(month < 10){
+        month = '0' + month
+      }
+      if(day < 10){
+        day = '0' + day
+      }
+      return `${year}-${month}-${day}`;
     },
     validateGrade(rule, value, callback) {
       if (this.studentList.length == 0) {
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index fabbc1b..04b11d4 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -139,7 +139,6 @@ import { useToolState } from '@/store/modules/tool'
 import MoveFile from '@/components/move-file/index.vue'
 import FileListItem from '@/views/prepare/container/file-list-item.vue'
 import { getSmarttalkPage, moveSmarttalk } from '@/api/file'
-import { homeworklist, listEntpcourse } from '@/api/teaching/classwork'
 import { toTimeText } from '@/utils/date'
 import { ElMessage } from 'element-plus'
 import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile'
@@ -148,8 +147,9 @@ import SetHomework from './container/set-homework.vue'
 import outLink from '@/utils/linkConfig'
 import { createWindow } from '@/utils/tool'
 import { cloneDeep } from 'lodash'
-import { delClasswork, addEntpcourse } from '@/api/teaching/classwork'
+import { delClasswork } from '@/api/teaching/classwork'
 import { getSelfReserv, startClass } from '@/api/classManage'
+import { useGetHomework } from '@/hooks/useGetHomework'
 const toolStore = useToolState()
 const fs = require('fs')
 const { ipcRenderer } = window.electron || {}
@@ -429,44 +429,11 @@ export default {
       this.initHomeWork()
       await this.asyncAllFile()
     },
+    // 获取作业
     async initHomeWork() {
-
-      if (this.uploadData.levelSecondId) {
-        // 获取作业列表所需ID 可能存在没有
-        let { rows } = await this.getChapterId()
-        if (rows.length > 0) {
-          this.entpcourseid = rows[0].id
-        } else {
-          await this.createEntpcourse()
-          let { rows } = await this.getChapterId()
-          this.entpcourseid = rows[0].id
-        }
-
-        // 查询作业
-        this.getHomeWorkList()
-      }
-    },
-    // 创建新的entpcourse
-    createEntpcourse() {
-      // 参照 web AIx 传入参数
-      var cform = {}
-      cform.entpid = this.userStore.deptId
-      cform.level = 1
-      cform.parentid = 0
-      cform.dictid = 0
-      cform.evalid = this.currentNode.id
-      cform.evalparentid = 0
-      cform.edusubject = this.currentNode.edusubject
-      cform.edudegree = this.currentNode.edudegree
-      cform.edustage = this.currentNode.edustage
-      cform.coursetype = '课标学科'
-      cform.coursetitle = this.currentNode.itemtitle
-      cform.coursedesc = ''
-      cform.status = ''
-      cform.dflag = 0
-      cform.edituserid = this.userStore.userId
-      cform.createblankfile = 'yes'
-      return addEntpcourse(cform)
+      const { res, chapterId } = await useGetHomework(this.currentNode)
+      this.entpcourseid = chapterId
+      this.currentWorkList = cloneDeep(res)
     },
     openReserv() {
       this.$refs['reservDialog'].openDialog()
@@ -496,79 +463,6 @@ export default {
         cookieData: { ...configObj.data }
       })
     },
-    // 根据教材章节单元ID 查询作业列表所需ID
-    getChapterId() {
-      return listEntpcourse({
-        evalid: this.uploadData.levelSecondId,
-        edituserid: this.userStore.userId,
-        pageSize: 500
-      })
-    },
-
-    // 查询作业列表
-    getHomeWorkList() {
-      homeworklist({
-        entpcourseid: this.entpcourseid,
-        edituserid: this.userStore.userId,
-        pageSize: 100
-      }).then((res) => {
-        //以下代码 参照AIx web端 作业布置
-        let list = []
-        for (var i = 0; i < res.rows.length; i++) {
-          res.rows[i].taskconfig = []
-
-          // 找child
-          for (var j = 0; j < res.rows.length; j++) {
-            if (res.rows[j].parentid == res.rows[i].id) {
-              var ss = []
-              if (res.rows[j].classworkdatastudentids != null) {
-                ss = JSON.parse('[' + res.rows[j].classworkdatastudentids + ']')
-              }
-              var js = {
-                id: res.rows[j].id,
-                classid: res.rows[j].classid,
-                classcaption: res.rows[j].classcaption,
-                parentid: 0,
-                worktype: '',
-                workkey: res.rows[j].workkey,
-                worktag: '',
-                entpcourseid: 0,
-                evalid: 0,
-                edusubject: '',
-                edudegree: '',
-                workdate: '',
-                title: '',
-                workcodes: '',
-                studentlist: ss,
-                deaddate: res.rows[j].deaddate,
-                timelength: res.rows[j].timelength,
-                weights: res.rows[j].weights,
-                feedtype: res.rows[j].feedtype
-              }
-              res.rows[i].taskconfig.push(js)
-            }
-          }
-          res.rows[i].fileShowName = res.rows[i].uniquekey
-
-          // 注意slideid>0的，这一些作业是添加到PPT页面的，所以在作业管理中不能出现
-          // 2024-05-15，酉阳，jackyshen
-          if (res.rows[i].classid == 0 && res.rows[i].slideid == 0) {
-            list.push(res.rows[i])
-          }
-
-          // 如果是习题训练任务，则检查一共有多少道
-          if (res.rows[i].entpcourseworklist != '') {
-            res.rows[i].entpcourseworklistarray = JSON.parse(
-              '[' + res.rows[i].entpcourseworklist + ']'
-            )
-          } else {
-            res.rows[i].entpcourseworklistarray = []
-          }
-        }
-        // 深度克隆
-        this.currentWorkList = cloneDeep(list)
-      })
-    },
     getWeekday1(date) {
       const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
       const weekday = new Date(date).getDay()
@@ -587,7 +481,7 @@ export default {
           ElMessage.success('操作成功')
           this.isLoading = false
           await this.asyncAllFile()
-          this.getHomeWorkList()
+          this.initHomeWork()
         })
         .catch(() => {
           this.isLoading = false
diff --git a/src/renderer/src/views/profile/cropperImage.vue b/src/renderer/src/views/profile/cropperImage.vue
index 5745127..702315b 100644
--- a/src/renderer/src/views/profile/cropperImage.vue
+++ b/src/renderer/src/views/profile/cropperImage.vue
@@ -11,7 +11,7 @@
           <!-- 裁剪+效果 -->
           <div class="box">
             <div class="box_1">
-              <img :src="filePath" ref="image" />
+              <img :src="dev_api + filePath" ref="image" />
             </div>
 
             <!--裁剪完的图片-->
@@ -60,6 +60,7 @@ export default {
     },
   },
   setup(props, context) {
+    const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 
     // 原生上传的文件
     const uploadImg = (e) => {
@@ -163,7 +164,7 @@ export default {
     // 页面刷新自动执行
     onMounted(() => {
       if (props.filePath) {
-        dataFile.image.src = props.filePath;
+        dataFile.image.src = dev_api.value + props.filePath;
         copper();
       }
     });
@@ -175,6 +176,7 @@ export default {
       uploadImg,
       upLoading,
       cancle,
+      dev_api
     };
   },
 };
diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue
index db29e01..45eaa40 100644
--- a/src/renderer/src/views/profile/index.vue
+++ b/src/renderer/src/views/profile/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20" style="display: flex;flex-wrap: nowrap;justify-content: start">
-      <el-col :xs="24" style="min-width: 260px;max-width: 260px">
+      <el-col :xs="24" style="min-width: 260px;max-width: 300px">
         <el-card class="box-card">
           <template v-slot:header>
             <div class="clearfix">
@@ -97,10 +97,10 @@ const state = reactive({
   postGroup: {}
 })
 
-function getUser() {
+async function getUser() {
   getUserProfile().then((response) => {
-    response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
-    state.user = response.data
+    // response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
+    Object.assign(state.user,response.data)
     state.roleGroup = response.roleGroup
     state.postGroup = response.postGroup
   })
diff --git a/src/renderer/src/views/profile/userAvatar.vue b/src/renderer/src/views/profile/userAvatar.vue
index 5e945c3..6f876fa 100644
--- a/src/renderer/src/views/profile/userAvatar.vue
+++ b/src/renderer/src/views/profile/userAvatar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="user-info-head" @click="editCropper()">
-    <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
+    <img :src="dev_api + options.img" title="点击上传头像" class="img-circle img-lg" />
     <el-dialog
       v-model="open"
       append-to-body
@@ -28,6 +28,7 @@ const userStore = useUserStore()
 
 const open = ref(false)
 const visible = ref(false)
+const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 
 //图片裁剪数据
 const options = reactive({
@@ -56,7 +57,7 @@ function uploadImg(data) {
   formData.append('avatarfile', data)
   uploadAvatar(formData).then((response) => {
     open.value = false
-    options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl
+    options.img = response.imgUrl
     userStore.user.avatar = options.img
     ElMessage({
       message: '上传成功',
@@ -68,7 +69,7 @@ function uploadImg(data) {
 
 /** 关闭窗口 */
 function closeDialog() {
-  // options.img = userStore.avatar
+  options.img = userStore.user.avatar
   options.visible = false
 }
 const cancle = () => {
diff --git a/src/renderer/src/views/tool/components/homework.vue b/src/renderer/src/views/tool/components/homework.vue
index ce13160..1ecbcf8 100644
--- a/src/renderer/src/views/tool/components/homework.vue
+++ b/src/renderer/src/views/tool/components/homework.vue
@@ -73,7 +73,6 @@
 import { ref, onMounted, toRaw } from 'vue';
 import { useRoute } from 'vue-router';
 import useUserStore from '@/store/modules/user'
-import { homeworklist } from '@/api/teaching/classwork'
 import { getSmarttalkPage, getPrepareById } from '@/api/file'
 import SetHomework from '@/views/prepare/container/set-homework.vue'
 import FileImage from '@/components/file-image/index.vue'
@@ -118,7 +117,7 @@ const closeHomework = () => {
 
 
 const changeChapter = async (data)=>{
-  const res = await useGetHomework(data)
+  const { res } = await useGetHomework(data)
   dataList.value = res
   let cata = parseCataByNode(data)
 
@@ -145,7 +144,7 @@ const openFileLink = (item) =>{
 // 获取资源数据
 const getResource = () => {
   let querySearch = toRaw(toolStore.curSubjectNode).querySearch
-
+  
   querySearch.orderByColumn = 'uploadTime'
   querySearch.isAsc = 'desc'
   querySearch.pageSize = 500
@@ -156,71 +155,13 @@ const getResource = () => {
 
 }
 
-// 获取作业数据
-const getHomework = () => {
+//获取作业数据
+const getHomework = async () => {
+  const data = toRaw(toolStore.curSubjectNode).data.node
   loading.value = true
   try {
-    homeworklist({
-      entpcourseid: entpcourseid.value,
-      edituserid: usertore.userId,
-      pageSize: 100
-    }).then(res => {
-      //以下代码 参照AIx web端 作业布置
-      let list = []
-      for (var i = 0; i < res.rows.length; i++) {
-        res.rows[i].taskconfig = []
-
-        // 找child
-        for (var j = 0; j < res.rows.length; j++) {
-          if (res.rows[j].parentid == res.rows[i].id) {
-            var ss = []
-            if (res.rows[j].classworkdatastudentids != null) {
-              ss = JSON.parse('[' + res.rows[j].classworkdatastudentids + ']')
-            }
-            var js = {
-              id: res.rows[j].id,
-              classid: res.rows[j].classid,
-              classcaption: res.rows[j].classcaption,
-              parentid: 0,
-              worktype: '',
-              workkey: res.rows[j].workkey,
-              worktag: '',
-              entpcourseid: 0,
-              evalid: 0,
-              edusubject: '',
-              edudegree: '',
-              workdate: '',
-              title: '',
-              workcodes: '',
-              studentlist: ss,
-              deaddate: res.rows[j].deaddate,
-              timelength: res.rows[j].timelength,
-              weights: res.rows[j].weights,
-              feedtype: res.rows[j].feedtype
-            }
-            res.rows[i].taskconfig.push(js)
-          }
-        }
-        res.rows[i].fileShowName = res.rows[i].uniquekey
-
-        // 注意slideid>0的，这一些作业是添加到PPT页面的，所以在作业管理中不能出现
-        // 2024-05-15，酉阳，jackyshen
-        if (res.rows[i].classid == 0 && res.rows[i].slideid == 0) {
-          list.push(res.rows[i])
-        }
-
-        // 如果是习题训练任务，则检查一共有多少道
-        if (res.rows[i].entpcourseworklist != '') {
-          res.rows[i].entpcourseworklistarray = JSON.parse(
-            '[' + res.rows[i].entpcourseworklist + ']'
-          )
-        } else {
-          res.rows[i].entpcourseworklistarray = []
-        }
-      }
-
-      dataList.value = list
-    })
+    const { res } = await useGetHomework(data)
+    dataList.value = res
   } finally {
     loading.value = false
   }
@@ -245,10 +186,10 @@ function leave(el, done) {
 onMounted(() => {
   entpcourseid.value = route.query.entpcourseid
   lesson.value = route.query.label
-  getHomework()
   setTimeout(()=>{
+    getHomework()
     getResource()
-  },1000)
+  },200)
 })
 </script>