From 05907eb39b00eb82acef7cc344ea2a7cc2891457 Mon Sep 17 00:00:00 2001 From: linquan <349589071@qq.com> Date: Wed, 25 Jun 2025 15:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E8=B4=A6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/gameManage/copyUnit/index.vue | 85 ++++++++++++++++--- src/views/gameOrder/rechargeControl/index.vue | 14 --- src/views/login/component/email.vue | 2 +- src/views/login/index.vue | 10 ++- 4 files changed, 81 insertions(+), 30 deletions(-) diff --git a/src/views/gameManage/copyUnit/index.vue b/src/views/gameManage/copyUnit/index.vue index 8994398..fe5abb5 100644 --- a/src/views/gameManage/copyUnit/index.vue +++ b/src/views/gameManage/copyUnit/index.vue @@ -48,6 +48,18 @@
下载仓库json数据
+ + +
正在复制村民
+
下载村民json数据
+ + + + +
正在复制装饰
+
下载装饰json数据
+ + @@ -78,14 +90,14 @@ :on-change="handleChange" :before-remove="beforeRemove" multiple - :limit="2" + :limit="4" :on-exceed="handleExceed" :file-list="fileList" > 点击上传 只能上传Json文件 - + @@ -95,6 +107,16 @@ + + + + + + + + + + @@ -199,6 +221,8 @@ const baseURL: string | undefined | boolean = import.meta.env.VITE_API_URL; interface TableData { filename: string; storeFilename: string; + deadFilename: string; + decorationFilename: string; SrcName: number; SrcServer: number; DestName: string; @@ -231,15 +255,21 @@ interface TableDataState { disabled: boolean; loading: boolean; loading1: boolean; + loading2: boolean; + loading3: boolean; fileList: object[]; filename: string; storeFilename: string; + deadFilename: string; + decorationFilename: string; serverSwitch: number; serverCategorize: object; } var timeInterval; var timeInterval1; +var timeInterval2; +var timeInterval3; export default defineComponent({ name: 'apiV1GameMangeCopyUnit', setup() { @@ -272,8 +302,12 @@ export default defineComponent({ disabled: true, loading: false, loading1: false, + loading2: false, + loading3: false, filename: '', storeFilename: '', + deadFilename: '', + decorationFilename: '', serverCategorize: ServerCategorize, }); const handleRemove = (file, fileList) => { @@ -284,14 +318,14 @@ export default defineComponent({ }; const handleExceed = (files, fileList) => { console.log('handleExceed: ', files, fileList); - warn(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); + warn(`当前限制选择 4 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); }; const handleChange = (files, fileList) => { console.log('handleChange: ', files, fileList); if (state.tableData.fileNames.indexOf(files.name) >= 0) { return; } - warn(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); + warn(`当前限制选择 4 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); state.tableData.data.filename = files.name; state.tableData.fileNames.push(files.name); }; @@ -301,10 +335,10 @@ export default defineComponent({ }; const copyUnit = () => { console.log('state.tableData.data: ', state.tableData.data); - // ElMessage.success('暂停使用'); - // return state.loading = true; state.loading1 = true; + state.loading2 = true; + state.loading3 = true; state.disabled = false; gameGMCopyUnit({ SrcName: state.tableData.data.SrcName, @@ -315,35 +349,46 @@ export default defineComponent({ console.log('copy: ', res); state.tableData.data.filename = res.data.filename; state.tableData.data.storeFilename = res.data.storeFilename; + state.tableData.data.deadFilename = res.data.deadFilename; + state.tableData.data.decorationFilename = res.data.decorationFilename; state.tableData.fileNames.push(res.data.filename); state.tableData.fileNames.push(res.data.storeFilename); + state.tableData.fileNames.push(res.data.deadFilename); + state.tableData.fileNames.push(res.data.decorationFilename); if (res.data.filename != '') { state.filename = res.data.filename; state.storeFilename = res.data.storeFilename; + state.deadFilename = res.data.deadFilename; + state.decorationFilename = res.data.decorationFilename; - console.log('gameRandomGenerateCode: ', res, state.filename, state.storeFilename); + console.log('gameRandomGenerateCode: ', res, state.filename, state.storeFilename, state.deadFilename, state.decorationFilename); timeInterval = setInterval(function () { checkGiftExchangeExists(); }, 1000); timeInterval1 = setInterval(function () { checkGiftExchangeExists1(); }, 1000); + timeInterval2 = setInterval(function () { + checkGiftExchangeExists2(); + }, 1000); + timeInterval3 = setInterval(function () { + checkGiftExchangeExists3(); + }, 1000); } }) .catch(() => { state.disabled = true; }) - .finally(() => { - }); + .finally(() => {}); }; const updateUnit = () => { console.log('state.tableData.data: ', state.tableData.data); - // ElMessage.success('暂停使用'); - // return gameGMUpdateUnit({ filename: state.tableData.data.filename, storeFilename: state.tableData.data.storeFilename, + deadFilename: state.tableData.data.deadFilename, + decorationFilename: state.tableData.data.decorationFilename, DestName: state.tableData.data.DestName, DestServer: state.tableData.data.DestServer, }) @@ -412,6 +457,24 @@ export default defineComponent({ } }); }; + const checkGiftExchangeExists2 = () => { + giftExchangeExists({ file: state.deadFilename }).then((response) => { + console.log('checkGiftExchangeExists2', state.deadFilename, response); + if (response.data.state == 1) { + clearInterval(timeInterval2); + state.loading2 = false; + } + }); + }; + const checkGiftExchangeExists3 = () => { + giftExchangeExists({ file: state.decorationFilename }).then((response) => { + console.log('checkGiftExchangeExists3', state.decorationFilename, response); + if (response.data.state == 1) { + clearInterval(timeInterval3); + state.loading3 = false; + } + }); + }; const onDownload = (file: string) => { if (file) { window.open(baseURL + 'download_file?filename=' + file); diff --git a/src/views/gameOrder/rechargeControl/index.vue b/src/views/gameOrder/rechargeControl/index.vue index 6a801ba..bc47f2b 100644 --- a/src/views/gameOrder/rechargeControl/index.vue +++ b/src/views/gameOrder/rechargeControl/index.vue @@ -40,8 +40,6 @@ import { toRefs, reactive, onMounted, defineComponent } from 'vue'; import { gameRechargeControlAdd, gameRechargeControlDelete, gameRechargeControlList } from '/@/api/game/index'; import { channelList, ChannelList } from '/@/utils/game'; -// import {ElMessageBox} from "element-plus/es"; - interface TableData { id: number; channel: string; @@ -71,11 +69,6 @@ export default defineComponent({ }); }; const add = (value: any) => { - // ElMessageBox.confirm("是否确认添加充值拦截？", '提示', { - // confirmButtonText: '确认', - // cancelButtonText: '取消', - // type: 'warning', - // }).then(() => { if (value == -1) { for (let i in state.channels) { gameRechargeControlAdd({ channel: state.channels[i].value }) @@ -93,14 +86,8 @@ export default defineComponent({ getRemain(); }) .finally(() => {}); - // }); }; const del = (value: any) => { - // ElMessageBox.confirm("是否确认去除充值拦截？", '提示', { - // confirmButtonText: '确认', - // cancelButtonText: '取消', - // type: 'warning', - // }).then(() => { if (value == -1) { for (let i in state.channels) { gameRechargeControlDelete({ channel: state.channels[i].value }) @@ -118,7 +105,6 @@ export default defineComponent({ getRemain(); }) .finally(() => {}); - // }); }; onMounted(function () { channelList().then((res) => { diff --git a/src/views/login/component/email.vue b/src/views/login/component/email.vue index 79c63ce..853e349 100644 --- a/src/views/login/component/email.vue +++ b/src/views/login/component/email.vue @@ -21,7 +21,7 @@ - + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2a72ea1..e86344a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -5,7 +5,7 @@