diff --git a/src/App.vue b/src/App.vue index ea45c79e..2e7b0db5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,7 +41,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.05------------"); + console.log("版本0.06------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index b97e2357..b970a072 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-29 17:09:48 + * @LastEditTime: 2022-11-30 15:03:21 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -53,7 +53,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - window.open("https://u-pre.boe.com/web/", '_self'); + // window.open("https://u-pre.boe.com/web/", '_self'); } console.log("api %o", msg); } diff --git a/src/api/index1.js b/src/api/index1.js index 5f51c679..c2d637ed 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-29 18:17:23 + * @LastEditTime: 2022-11-30 10:39:27 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -130,7 +130,7 @@ export const orgtree = () => http.get("/org/tree"); //获取积分列表 export const noticeList = (projectId) => http.post( - `http://localhost:8080/api/admin/project/noticeList?projectId=` + + `/admin/project/noticeList?projectId=` + projectId + `` ); diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 9b0295c8..6ba63ad6 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -92,7 +92,7 @@
{ state.courseName = ""; - state.memberValue = null; + state.memberValue = {}; state.duration = null; state.address = null; state.before=null; @@ -569,7 +569,7 @@ export default { if ( state.courseName == "" || state.chooseCourse == null || - state.memberValue == "" || + state.memberValue == {} || state.chooseTime == [] || state.duration == "" || state.address == "" @@ -718,9 +718,9 @@ export default { }; // 获取员工 const queryMember = () => { - if (!state.memberValue) return; + if (!state.memberValue || !state.memberValue.label) return; let obj = { - keyWord: state.memberValue, + keyWord: state.memberValue.label, id: 0, org: 0, pageNo: state.currentPage, @@ -747,7 +747,7 @@ export default { options.value = []; state.fetching = true; state.currentPage = 1; - state.memberValue = memberValue; + state.memberValue.label = memberValue; queryMember(); state.fetching = false; }, 300); diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 1bfefaad..6ca96e7b 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -15,8 +15,8 @@ @click="closeDrawer" />
- -
+ +
- -
@@ -311,7 +309,6 @@ 确定 - -
- +
取消 - 确定 + 确定
- -
@@ -395,7 +389,7 @@