Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",

src/main/index.js

@@ -62,10 +62,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: {

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'
+  })
+}

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()
   }

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

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

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]

src/renderer/src/views/prepare/index.vue

@@ -3,8 +3,8 @@
     <ChooseTextbook @change-book="nodeClick" @node-click="nodeClick" />
     <div class="page-right">
       <div class="header-top flex">
-        <div class="textbook-img">
-          <el-image style="width: 80px; height: 110px" :src="curBookImg" @click="navtoPdf" />
+        <div class="textbook-img" @click="navtoPdf">
+          <el-image style="width: 80px; height: 110px" :src="curBookImg" />
           <el-progress
             v-if="downloadNum > 0 && downloadNum < 100"
             style="position: absolute; left: 0; z-index: 999"
@@ -92,7 +92,7 @@
           @on-delete="deleteTalk"
           @on-set="openSet"
           @on-delhomework="delhomework"
-        
+
         >
           <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
         </file-list-item>

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
     };
   },
 };

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
   })

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 = () => {

src/renderer/src/views/profile/userInfo.vue

@@ -129,7 +129,7 @@ function submit() {
       props.user.avatar = userStore.user.avatar
       updateUserInfo(props.user).then((response) => {
         if(response.code == 200){
-          userStore.login({username:props.user.phonenumber,password:props.user.plainpwd}).then(() => {
+          userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
             userStore.getInfo().then(res => {
               if(res.code === 200){
                 ElMessage.success('修改成功')