hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 10:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug 用户中心接口调整

Browse Source
This commit is contained in:
yuping
2023-07-08 11:14:37 +08:00
parent 727a377afa
commit be90a8b34e
4 changed files with 94 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -28,7 +28,7 @@ import BreadCrumb from "@/components/BreadCrumb";
import zhCN from "ant-design-vue/es/locale/zh_CN";
import * as api1 from "@/api/index1";
import * as api2 from "@/api/index";
import {boeRequest, request} from "@/api/request";
import {request} from "@/api/request";
import {USER_PERMISSION} from "@/api/apis";
const store = useStore();

147
src/api/request.js
View File

@@ -79,68 +79,68 @@ export function useBoeApiPage(_url, params = {}, config = {
};
}
export function useBoeApi(_url, params = {}, config = {
init: true,
result: res => res.result,
}) {
// export function useBoeApi(_url, params = {}, config = {
// init: true,
// result: res => res.result,
// }) {
//
// const state = reactive({
// data: [],
// loading: false,
// });
// watch(() => params, () => {
// fetch();
// });
//
// function fetch() {
// state.loading = true;
// return boeRequest(_url, params).then(r => {
// state.data = config.result(r);
// state.loading = false;
// });
// }
//
// config.init && fetch();
// return {
// ...toRefs(state),
// fetch,
// };
// }
const state = reactive({
data: [],
loading: false,
});
watch(() => params, () => {
fetch();
});
function fetch() {
state.loading = true;
return boeRequest(_url, params).then(r => {
state.data = config.result(r);
state.loading = false;
});
}
config.init && fetch();
return {
...toRefs(state),
fetch,
};
}
export function useBoeUserListPage(_url, params = {}, init = true) {
const state = reactive({
data: [],
loading: false,
total: 0,
totalPage: 0,
page: 1,
...params
});
watch(() => params.keyword, throttle(fetch, 600));
watch(() => params.page, fetch);
function fetch() {
state.loading = true;
if (!params.keyword) {
state.loading = false;
return;
}
return boeRequest(_url, params).then(r => {
state.data = params.page === 1 ? r.result.userInfoList : [...state.data, ...r.result.userInfoList];
state.totalPage = r.result.totalPage;
state.total = r.result.totalElement;
state.loading = false;
});
}
init && fetch();
return {
...toRefs(state),
fetch,
};
}
// export function useBoeUserListPage(_url, params = {}, init = true) {
//
// const state = reactive({
// data: [],
// loading: false,
// total: 0,
// totalPage: 0,
// page: 1,
// ...params
// });
//
// watch(() => params.keyword, throttle(fetch, 600));
// watch(() => params.page, fetch);
//
// function fetch() {
// state.loading = true;
// if (!params.keyword) {
// state.loading = false;
// return;
// }
// return boeRequest(_url, params).then(r => {
// state.data = params.page === 1 ? r.result.userInfoList : [...state.data, ...r.result.userInfoList];
// state.totalPage = r.result.totalPage;
// state.total = r.result.totalElement;
// state.loading = false;
// });
// }
//
// init && fetch();
// return {
// ...toRefs(state),
// fetch,
// };
// }
export function useNewRowsPageNoInit(_url, params) {
const state = reactive({
data: [],
@@ -318,7 +318,32 @@ export function useRequest(_url, params, init = true) {
fetchData,
};
}
export function useArrayRequest(_url, params, init = true) {
const data = ref([]);
const loading = ref(false);
if (isRef(params)) {
watch(params.value, () => {
fetchData();
});
}
function fetchData() {
loading.value = true;
request(_url, unref(params)).then(r => {
data.value = r.data;
loading.value = false;
});
}
init && fetchData();
return {
data,
loading,
fetchData,
};
}
export async function boeRequest(_url, params = {}) {
const s = _url.split(" ");
let url = s[0];

9
src/components/project/OrgClass.vue
View File

@@ -36,7 +36,7 @@
</template>
<script setup>
import { defineEmits, defineProps, ref, watch } from "vue";
import {boeRequest, useRequest} from "@/api/request";
import {request, useArrayRequest, useRequest} from "@/api/request";
import {ORG_CHILD_LIST, ORG_LIST} from "@/api/apis";
const props = defineProps({
@@ -50,7 +50,7 @@ const props = defineProps({
const emit = defineEmits({});
const stuTreeExpandedKeys = ref([]);
const labelValue = ref({ value: props.value, label: props.name });
const { data: options, loading: orgLoading } = useRequest(
const { data: options, loading: orgLoading } = useArrayRequest(
ORG_LIST,
{ keyword: "" },
);
@@ -66,9 +66,9 @@ watch(props, () => {
});
function onLoadData(treeNode) {
return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
return useArrayRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
(r) => {
treeNode.dataRef.treeChildList = r.result.directChildList;
treeNode.dataRef.treeChildList = r.data;
options.value = [...options.value];
}
);
@@ -83,7 +83,6 @@ function change(
},
}
) {
console.log("label2222", label, namePath, value);
emit("update:name", label);
emit("update:fullName", namePath);
emit("update:value", value);

6
src/components/project/OrgClassCheck.vue
View File

@@ -37,7 +37,7 @@
</template>
<script setup>
import {defineEmits, defineProps, ref, watch, watchEffect} from "vue";
import {boeRequest, useRequest} from "@/api/request";
import {request, useRequest} from "@/api/request";
import { ORG_CHILD_LIST, ORG_LIST } from "@/api/ThirdApi";
const props = defineProps({
@@ -80,9 +80,9 @@ watch(props, () => {
});
function onLoadData(treeNode) {
return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
return request(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
(r) => {
treeNode.dataRef.treeChildList = r.result.directChildList;
treeNode.dataRef.treeChildList = r.data;
options.value = [...options.value];
}
);