From ac9032a84fd04d9de87fcc5ff93d2e2e2b2c5d4e Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Wed, 17 Jul 2024 15:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AA=97=E5=8F=A3=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/index.js                                |  4 ++--
 src/renderer/src/App.vue                         |  1 -
 src/renderer/src/layout/index.vue                |  3 +++
 src/renderer/src/router/index.js                 |  2 +-
 src/renderer/src/views/login/index.vue           |  5 +++--
 .../views/resource/container/resoure-search.vue  |  4 ++--
 src/renderer/src/views/resource/index.vue        | 11 +++++------
 src/renderer/src/views/resource/store.js         | 16 +++++++++++++---
 8 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 60f902a..72d5a72 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -8,8 +8,8 @@ File({ app, shell, BrowserWindow, ipcMain })
 function createWindow() {
   // Create the browser window.
   const mainWindow = new BrowserWindow({
-    width: 1050,
-    height: 650,
+    width: 888,
+    height: 520,
     show: false,
     frame: false,
     autoHideMenuBar: true,
diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index 4ece3da..1c467ca 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -8,7 +8,6 @@
 import { ref } from 'vue'
 
 const size = ref('default')
-// const size = computed(() => store.state.app.elementSize)
 </script>
 
 <style>
diff --git a/src/renderer/src/layout/index.vue b/src/renderer/src/layout/index.vue
index f147499..dd659c9 100644
--- a/src/renderer/src/layout/index.vue
+++ b/src/renderer/src/layout/index.vue
@@ -14,6 +14,9 @@
 import Header from './components/Header.vue'
 import AppMain from './components/AppMain.vue'
 import Uploader from './components/Uploader.vue'
+
+const { ipcRenderer } = window.electron || {}
+ipcRenderer.send('set-winsize', { x: 1200, y: 700 })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js
index d464845..21512d5 100644
--- a/src/renderer/src/router/index.js
+++ b/src/renderer/src/router/index.js
@@ -12,7 +12,7 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/resource',
+    redirect: '/login',
     children: [
       {
         path: '/resource',
diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue
index 8aec725..0c0ec14 100644
--- a/src/renderer/src/views/login/index.vue
+++ b/src/renderer/src/views/login/index.vue
@@ -43,10 +43,10 @@ import { encrypt, decrypt } from '@/utils/jsencrypt'
 import useUserStore from '@/store/modules/user'
 import leftBg2 from '@/assets/images/login/left-bg2.png'
 
+const { ipcRenderer } = window.electron || {}
 const formRef = ref()
 const userStore = useUserStore()
 const router = useRouter()
-const { ipcRenderer } = window.electron || {}
 const isMaxSize = ref(false)
 const btnLoading = ref(false)
 //表单
@@ -61,6 +61,8 @@ const rules = reactive({
   password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }]
 })
 
+ipcRenderer.send('set-winsize', { x: 888, y: 520 })
+
 //登录
 const submitForm = async (formEl) => {
   if (!formEl) return
@@ -101,7 +103,6 @@ const getCookie = () => {
 }
 
 onMounted(()=>{
-  // ipcRenderer.send('set-winsize',{x:888,y: 520})
   getCookie()
 })
 // 最小化
diff --git a/src/renderer/src/views/resource/container/resoure-search.vue b/src/renderer/src/views/resource/container/resoure-search.vue
index c7ae293..4500089 100644
--- a/src/renderer/src/views/resource/container/resoure-search.vue
+++ b/src/renderer/src/views/resource/container/resoure-search.vue
@@ -13,8 +13,8 @@
     </el-row>
     <el-row class="resoure-btns">
       <el-col :span="24" class="query-row flex">
-        <div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix" 
-            style="width: 100px">
+        <div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix"  @change="sourceStore.changeSuffix"
+            style="width: 110px">
             <el-option v-for="item in sourceStore.resourceFormatList" :key="item.value" :label="item.label"
               :value="item.value" />
           </el-select>
diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue
index 17fc3fb..29a7f80 100644
--- a/src/renderer/src/views/resource/index.vue
+++ b/src/renderer/src/views/resource/index.vue
@@ -25,7 +25,6 @@ import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import ResoureSearch from './container/resoure-search.vue'
 import ResoureList from './container/resoure-list.vue'
 import uploadDialog from '@/components/upload-dialog/index.vue'
-import MoveFile from '@/components/move-file/index.vue'
 import uploaderState from '@/store/modules/uploader'
 
 const sourceStore = useResoureStore()
@@ -54,17 +53,17 @@ const nodeClick = (data) => {
 // 查询
 const getData = (data) => {
   const { textBook, node } = data
-  let textBookId = textBook.curBookId
+  let textbookId = textBook.curBookId
   let levelFirstId = node.id
   let levelSecondId = node.parentNode ? node.parentNode.id : ''
   sourceStore.query = {
-    textBookId,
+    textbookId,
     levelFirstId,
     levelSecondId,
     ...sourceStore.query
   }
   sourceStore.nodeData = {
-    textBookId,
+    textbookId,
     levelFirstId,
     levelSecondId,
   }
@@ -74,9 +73,9 @@ const getData = (data) => {
 // 提交文件
 const submitFile = (data) => {
   let fileList = toRaw(data)
-  const { textBookId, levelFirstId, levelSecondId, fileSource, fileRoot } = sourceStore.query
+  const { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } = sourceStore.query
   // 给每个文件添加属性
-  let fileData = { textBookId, levelFirstId, levelSecondId, fileSource, fileRoot }
+  let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot }
   fileList.forEach(item => {
     fileData.fileShowName = item.fileData.fileShowName
     fileData.fileFlag = item.fileData.fileFlag
diff --git a/src/renderer/src/views/resource/store.js b/src/renderer/src/views/resource/store.js
index e790a16..f867714 100644
--- a/src/renderer/src/views/resource/store.js
+++ b/src/renderer/src/views/resource/store.js
@@ -15,7 +15,7 @@ const resourceTypeList = [
 const resourceFormatList = [
   {
     label: '资源格式',
-    value: ''
+    value: -1
   },
   ...resourceFormat
 ]
@@ -49,7 +49,9 @@ export default defineStore('resource', {
     //查询条件
     query: {
       fileSource: '平台',
-      fileSuffix: '',
+      //资源格式  mp3 ppt ...
+      fileSuffix: -1,
+      // 资源类型 课件 素材 教案
       fileFlag: '',
       fileRoot: '资源',
       orderByColumn: 'uploadTime',
@@ -65,7 +67,11 @@ export default defineStore('resource', {
     handleQuery() {
       try {
         this.loading = true
-        getSmarttalkPage(this.query).then((res) => {
+        let data = {...this.query}
+        if(data.fileSuffix == -1){
+          data.fileSuffix = ''
+        }
+        getSmarttalkPage(data).then((res) => {
           this.result.total = res.total
           this.result.list = res.rows
         })
@@ -80,6 +86,10 @@ export default defineStore('resource', {
     changeType(val) {
       this.query.fileFlag = val
       this.handleQuery()
+    },
+    changeSuffix(val){
+      this.query.fileSuffix = val
+      this.handleQuery()
     }
   }
 })