From 69e835a743eb08427a1848f7cb1b37b0df1d9657 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Wed, 17 Jul 2024 14:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=96=87=E4=BB=B6=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=E6=A0=B8=E5=BF=83=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
electron.vite.config.mjs | 4 +-
src/renderer/src/api/file/index.js | 8 +++
src/renderer/src/views/prepare/index.vue | 76 +++++++++++++++++-------
3 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs
index fe59903..12cab0b 100644
--- a/electron.vite.config.mjs
+++ b/electron.vite.config.mjs
@@ -22,8 +22,8 @@ export default defineConfig({
server: {
proxy: {
'/dev-api': {
- target: 'http://27.128.240.72:7865',
- // target: 'http://192.168.2.52:7863',
+ // target: 'http://27.128.240.72:7865',
+ target: 'http://192.168.2.52:7863',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
},
diff --git a/src/renderer/src/api/file/index.js b/src/renderer/src/api/file/index.js
index c4b877f..4db081d 100644
--- a/src/renderer/src/api/file/index.js
+++ b/src/renderer/src/api/file/index.js
@@ -23,3 +23,11 @@ export const updateSmarttalk = (params) => {
params
})
}
+
+export const moveSmarttalk = (params) => {
+ return request({
+ url: '/smarttalk/file/moveSmarttalk',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index ec2f96e..4d27b28 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -8,16 +8,22 @@
-
- {{lastAsyncAllTime?(toTimeText(lastAsyncAllTime) + '同步成功'):''}}
+
+ {{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
-
+
- {{asyncAllFileVisiable?'同步中':'云同步'}}
+ {{ asyncAllFileVisiable ? '同步中' : '云同步' }}
@@ -28,11 +34,7 @@
-
+
-
-
+
+
+
+
移动
@@ -120,6 +124,7 @@
+
@@ -132,16 +137,19 @@ import uploadDialog from '@/components/upload-dialog/index.vue'
import { Refresh } from '@element-plus/icons-vue'
import uploaderState from '@/store/modules/uploader'
import FileImage from '@/components/file-image/index.vue'
-import { deleteSmarttalk, getSmarttalkPage, updateSmarttalk } from '@/api/file'
+import MoveFile from '@/components/move-file/index.vue'
+import { deleteSmarttalk, getSmarttalkPage, updateSmarttalk, moveSmarttalk } from '@/api/file'
import { toTimeText } from '@/utils/date'
import { ElMessage, ElMessageBox } from 'element-plus'
import { isHaveLocalFile } from '@/utils/talkFile'
+
const { ipcRenderer } = window.electron || {}
export default {
name: 'Prepare',
- components: { ChooseTextbook, Refresh, uploadDialog, FileImage },
+ components: { ChooseTextbook, Refresh, uploadDialog, FileImage, MoveFile },
data() {
return {
+ isMoveDialogOpen: false,
asyncAllFileVisiable: false,
isLoading: false,
isDialogOpen: false,
@@ -180,14 +188,14 @@ export default {
methods: {
async asyncAllFile() {
this.lastAsyncAllTime = new Date()
- localStorage.setItem('lastAsyncAllTime',this.lastAsyncAllTime)
- let arr = [];
- this.asyncAllFileVisiable = true;
+ localStorage.setItem('lastAsyncAllTime', this.lastAsyncAllTime)
+ let arr = []
+ this.asyncAllFileVisiable = true
const test = (item) => {
- return new Promise((resolve, reject)=>{
+ return new Promise((resolve, reject) => {
isHaveLocalFile(item.fileNewName).then((res) => {
item.async = res
- if (res===false) {
+ if (res === false) {
ipcRenderer.send('download-file-default', {
url: item.fileFullPath,
fileName: item.fileNewName
@@ -197,7 +205,7 @@ export default {
item.async = isSuccess
resolve()
})
- }else {
+ } else {
resolve()
}
})
@@ -206,7 +214,7 @@ export default {
for (let i = 0; i < this.currentFileList.length; i++) {
await test(this.currentFileList[i])
}
- this.asyncAllFileVisiable = false;
+ this.asyncAllFileVisiable = false
},
openFileWin(item) {
isHaveLocalFile(item.fileNewName).then((res) => {
@@ -274,6 +282,27 @@ export default {
closePopver(index) {
this.$refs['popover_' + index][0].hide()
},
+ chooseMoveCata(cataData, item) {
+ let params = {
+ id: item.id,
+ textBookId: cata.textBook.curBookId,
+ }
+ let cata = this.parseCataByNode(cataData.node)
+ if (cata.length > 0) {
+ params.levelFirstId = cata[0];
+ }
+ if (cata.length > 1) {
+ params.levelSecondId = cata[1];
+ }
+ if (cata.length > 2) {
+ params.levelThirdId = cata[2];
+ }
+ moveSmarttalk(params).then((res) => {
+ if (res.data === true) {
+ this.isMoveDialogOpen = false
+ }
+ })
+ },
submitFile(files) {
let _this = this
files.filter((file) => {
@@ -284,7 +313,7 @@ export default {
res.resData.levelSecondId == _this.uploadData.levelSecondId &&
res.resData.levelThirdId == _this.uploadData.levelThirdId
) {
- res.resData.async = true;
+ res.resData.async = true
_this.currentFileList.unshift(res.resData)
ElMessage({
type: 'success',
@@ -367,12 +396,14 @@ export default {
color: #a2a2a2;
}
}
+
.prepare-item-info-message {
.circular {
width: 100% !important;
}
}
-.prepare-body-header{
+
+.prepare-body-header {
.circular {
width: 100% !important;
}
@@ -454,6 +485,7 @@ export default {
line-height: 23px;
color: #909399;
display: flex;
+
.circular {
width: 100% !important;
}