staging #32
|
|
@ -12,11 +12,12 @@ import type {
|
||||||
import { stringify } from "qs";
|
import { stringify } from "qs";
|
||||||
import NProgress from "../progress";
|
import NProgress from "../progress";
|
||||||
import { getToken, formatToken } from "@/utils/auth";
|
import { getToken, formatToken } from "@/utils/auth";
|
||||||
import { useUserStoreHook } from "@/store/modules/user";
|
import { useUserStore, useUserStoreHook } from "@/store/modules/user";
|
||||||
// import { string } from "vue-types";
|
// import { string } from "vue-types";
|
||||||
import router from "@/router";
|
import router from "@/router";
|
||||||
import { ElMessage } from "element-plus";
|
import { ElMessage } from "element-plus";
|
||||||
import { message } from "../message";
|
import { message } from "../message";
|
||||||
|
import { store } from "@/store";
|
||||||
|
|
||||||
/**请求后端的地址 未配置则访问BaseURL */
|
/**请求后端的地址 未配置则访问BaseURL */
|
||||||
const apiServiceConfig = {
|
const apiServiceConfig = {
|
||||||
|
|
@ -208,6 +209,10 @@ class PureHttp {
|
||||||
router.push({
|
router.push({
|
||||||
path: "/error/403"
|
path: "/error/403"
|
||||||
});
|
});
|
||||||
|
}if (error.response?.status == 401) {
|
||||||
|
debugger;
|
||||||
|
ElMessage.warning("登录信息失效,请重新登录!");
|
||||||
|
return useUserStore(store).logOut();
|
||||||
}
|
}
|
||||||
// 所有的响应异常 区分来源为取消请求/非取消请求
|
// 所有的响应异常 区分来源为取消请求/非取消请求
|
||||||
return Promise.reject($error);
|
return Promise.reject($error);
|
||||||
|
|
@ -235,13 +240,13 @@ class PureHttp {
|
||||||
.request(config)
|
.request(config)
|
||||||
.then((response: any) => {
|
.then((response: any) => {
|
||||||
if (response.code != null && response.code !== 200) {
|
if (response.code != null && response.code !== 200) {
|
||||||
|
|
||||||
message(response.message, { type: "error" });
|
message(response.message, { type: "error" });
|
||||||
} resolve(response);
|
}
|
||||||
|
resolve(response);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
if (error.status != 200) {
|
if (error.status != 200) {
|
||||||
ElMessage.warning("请求失败" + error.message);
|
ElMessage.warning("请求失败: " + error.message);
|
||||||
}
|
}
|
||||||
reject(error);
|
reject(error);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,9 @@
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-input v-model="search.searchStr" placeholder="姓名/账号/学号" />
|
<el-input v-model="search.searchStr" placeholder="姓名/账号/学号" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-input v-model="search.phone" placeholder="手机号" />
|
||||||
|
</el-form-item>
|
||||||
<!-- <el-form-item style="width: 100px">
|
<!-- <el-form-item style="width: 100px">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="search.userType"
|
v-model="search.userType"
|
||||||
|
|
@ -270,7 +273,8 @@ import {
|
||||||
Message,
|
Message,
|
||||||
ArrowDownBold,
|
ArrowDownBold,
|
||||||
Search,
|
Search,
|
||||||
Star
|
Star,
|
||||||
|
Phone
|
||||||
} from "@element-plus/icons-vue";
|
} from "@element-plus/icons-vue";
|
||||||
import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
|
import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
|
||||||
import { ImportTeacher } from "@/api/student";
|
import { ImportTeacher } from "@/api/student";
|
||||||
|
|
@ -280,6 +284,7 @@ const schoolsAPI = new hTableAPI("usercenter/back/schools");
|
||||||
|
|
||||||
interface SearchParams {
|
interface SearchParams {
|
||||||
searchStr: string;
|
searchStr: string;
|
||||||
|
phone: string;
|
||||||
userType: string | number;
|
userType: string | number;
|
||||||
level: string | number;
|
level: string | number;
|
||||||
schoolId: string | number;
|
schoolId: string | number;
|
||||||
|
|
@ -368,6 +373,7 @@ const selectUserTable = ref();
|
||||||
|
|
||||||
const search = reactive<SearchParams>({
|
const search = reactive<SearchParams>({
|
||||||
searchStr: "",
|
searchStr: "",
|
||||||
|
phone: "",
|
||||||
userType: "",
|
userType: "",
|
||||||
level: "",
|
level: "",
|
||||||
schoolId: "",
|
schoolId: "",
|
||||||
|
|
@ -571,6 +577,7 @@ const getClass = () => {
|
||||||
const fetchPagedData = (searchUnUse = false) => {
|
const fetchPagedData = (searchUnUse = false) => {
|
||||||
const data = {
|
const data = {
|
||||||
SearchStr: search.searchStr,
|
SearchStr: search.searchStr,
|
||||||
|
Phone: search.phone,
|
||||||
UserType: 2,
|
UserType: 2,
|
||||||
Level: search.level || 0,
|
Level: search.level || 0,
|
||||||
SchoolId: search.schoolId || 0,
|
SchoolId: search.schoolId || 0,
|
||||||
|
|
@ -715,7 +722,6 @@ const importData = () => {
|
||||||
fileE.onchange = async function () {
|
fileE.onchange = async function () {
|
||||||
formData.append("file", fileE.files[0]);
|
formData.append("file", fileE.files[0]);
|
||||||
let res = await ImportTeacher(fileE.files[0]);
|
let res = await ImportTeacher(fileE.files[0]);
|
||||||
debugger;
|
|
||||||
if (res.code != undefined) {
|
if (res.code != undefined) {
|
||||||
if (res.code !== 200) return ElMessage.error(res.message);
|
if (res.code !== 200) return ElMessage.error(res.message);
|
||||||
else return ElMessage.success("所有数据录入成功");
|
else return ElMessage.success("所有数据录入成功");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue