hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-13 21:06:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-17 15:26:48 +08:00
parent 756221c47d
commit 0e01c8de18
3 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/api.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-11 16:57:58
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-15 10:56:54
* @LastEditTime: 2022-12-17 14:59:41
* @FilePath: /fe-stu/src/api/api.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/

20
src/api/request.js
View File

@@ -1,7 +1,7 @@
import router from "@/router";
import {reactive, ref, toRefs, watch} from "vue";
import { reactive, ref, toRefs, watch } from "vue";
import axios from 'axios';
import {getCookie} from "@/api/utils";
import { getCookie } from "@/api/utils";
export function usePage(_url, param) {
@@ -11,11 +11,11 @@ export function usePage(_url, param) {
total: 0,
size: 10,
current: 1,
params: {pageNo: 1, pageSize: 10, ...param}
params: { pageNo: 1, pageSize: 10, ...param }
})
watch(param, () => {
state.params = {...state.params, ...param}
state.params = { ...state.params, ...param }
fetchData()
})
@@ -86,14 +86,14 @@ export async function request(_url, params) {
method,
headers: {
'token': getCookie('token'),
...method !== 'get' ? {'Content-Type': 'application/json'} : {}
...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
},
baseURL: import.meta.env.VITE_BASE_API,
...method !== 'get' ? {data: JSON.stringify(body)} : {}
...method !== 'get' ? { data: JSON.stringify(body) } : {}
}).then(resp => resp.data).then(response => {
if (response.code !== 200 && response.code !== 0) {
if (response.code === 1000) {
import.meta.env.MODE === 'development' ? router.push({path: '/login'}) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
}
// if (import.meta.env.DEV && response.code === 1000) {
// router.push({path: '/login'})
@@ -108,7 +108,7 @@ export async function request(_url, params) {
}
return response
}).catch(e => {
console.log(e)
console.log('eeeee', e)
// router.push({path: '/login'})
})
}
@@ -135,10 +135,10 @@ export async function boeRequest(_url, params) {
method,
headers: {
token: getCookie('token'),
...method !== 'get' ? {'Content-Type': 'application/json'} : {}
...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
},
baseURL: '',
...method !== 'get' ? {data: JSON.stringify(body)} : {}
...method !== 'get' ? { data: JSON.stringify(body) } : {}
}).then(resp => resp.data).then(response => {
return response
}).catch(e => {

74
src/components/img/UploadImg.vue
View File

@@ -1,11 +1,19 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-11 16:57:58
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-17 14:51:44
* @FilePath: /fe-stu/src/components/img/UploadImg.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<el-upload
:file-list="files"
:action="FILE_UPLOAD"
method="POST"
:show-file-list="false"
:on-change="handleChange"
ref="imageRef"
:file-list="files"
:action="FILE_UPLOAD"
method="POST"
:show-file-list="false"
:on-change="handleChange"
ref="imageRef"
>
<template #trigger>
<div>
@@ -15,52 +23,56 @@
</el-upload>
</template>
<script setup>
import {FILE_UPLOAD} from "@/api/api";
import {defineProps, ref} from "vue";
import { FILE_UPLOAD } from "@/api/api";
import { defineProps, ref } from "vue";
const {modelValue = []} = defineProps({
modelValue: []
})
const { modelValue = [] } = defineProps({
modelValue: [],
});
const emit = defineEmits()
const emit = defineEmits();
const files = ref(modelValue)
const imageRef = ref()
const files = ref(modelValue);
const imageRef = ref();
function handleChange(e) {
console.log(e)
console.log("上传", e);
if (e.response && e.response.code === 200) {
e.url = e.response.data
e.url = e.response.data;
}
const index = files.value.findIndex(f => f.uid === e.uid)
const index = files.value.findIndex((f) => f.uid === e.uid);
if (index === -1) {
files.value.unshift(e)
files.value.unshift(e);
} else {
files.value[index] = e
files.value[index] = e;
}
emit('update:modelValue', files)
emit("update:modelValue", files);
}
function remove(i) {
files.value.splice(i, 1)
files.value.splice(i, 1);
}
function reUpload(i) {
if (files.value[i].status === 'ready' || files.value[i].status === 'uploading') {
imageRef.value.abort(files.value[i].raw)
files.value[i].status = 'abort';
} else if (files.value[i].status === 'fail'||files.value[i].status === 'abort') {
imageRef.value.handleStart(files.value[i].raw)
imageRef.value.submit()
if (
files.value[i].status === "ready" ||
files.value[i].status === "uploading"
) {
imageRef.value.abort(files.value[i].raw);
files.value[i].status = "abort";
} else if (
files.value[i].status === "fail" ||
files.value[i].status === "abort"
) {
imageRef.value.handleStart(files.value[i].raw);
imageRef.value.submit();
}
}
function abort(i) {
imageRef.value.abort(files.value[i].raw)
imageRef.value.abort(files.value[i].raw);
}
defineExpose({reUpload, remove})
defineExpose({ reUpload, remove });
</script>