Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release

src/App.vue

@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本1.05------------");
+    console.log("版本1.06------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/api/request.js

@@ -77,12 +77,12 @@ export function useBoeUserListPage(_url, params = {}, init = true) {
         ...params
     })
 
-    watch(() => params.keyWord, throttle(fetch, 600))
+    watch(() => params.keyword, throttle(fetch, 600))
     watch(() => params.page, fetch)
 
     function fetch() {
         state.loading = true
-        if (!params.keyWord) {
+        if (!params.keyword) {
             state.loading = false
             return
         }

src/components/OpenPages.vue

@@ -51,7 +51,7 @@ export default {
     const store = useStore();
     const $router = useRouter();
     const state = reactive({
-      openList: store.state.openpages,
+      //openList: store.state.openpages,
     });
 
     const closePage = (value) => {

src/components/drawers/AddTest.vue

@@ -436,7 +436,7 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("props", props);
-      if (props.addtestVisible && props.edit) {
+      if (props.addtestVisible && props.EditTestId) {
         // 该页面显示同时 edit为true 时，发送查询请求,
         queryTest();
       }

src/components/project/ProjectManagerNew.vue

@@ -56,7 +56,7 @@ const emit = defineEmits({})
 
 const isOpen = ref(false)
 
-const memberParam = ref({keyWord: '', page: 1, pageSize: 20})
+const memberParam = ref({keyword: '', page: 1, pageSize: 20})
 
 const {data: userList, loading} = useBoeUserListPage(USER_LIST, memberParam.value, false)
 
@@ -87,23 +87,23 @@ const memberScroll = ({target: {scrollHeight, scrollTop, clientHeight}}) => {
 };
 
 //搜索学员
-const searchMember = (keyWord) => {
+const searchMember = (keyword) => {
-  console.log('searchMember', keyWord)
+  console.log('searchMember', keyword)
   loading.value = true
   isOpen.value = true
   userList.value = []
   memberParam.value.page = 1
-  memberParam.value.keyWord = keyWord
+  memberParam.value.keyword = keyword
 };
 
 function blur() {
   isOpen.value = false
-  memberParam.value.keyWord = ''
+  memberParam.value.keyword = ''
   memberParam.value.page = 1
 }
 
 function change(e, l) {
-  memberParam.value.keyWord = ''
+  memberParam.value.keyword = ''
   memberParam.value.page = 1
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)

src/components/student/CommonStudent.vue

@@ -654,6 +654,7 @@ const deleteDepSelect = () => {
 //重置受众
 const resetAudienceInfo = () => {
   audienceName.value = { keyword: "", page: 1, pageSize: 10 };
+  searchStu();
 };
 //全部清除
 // const deleteAll = () => {

src/views/projectcenter/ProjectManage.vue

@@ -45,6 +45,7 @@
         </div>
         <div class="select addTimeBox">
           <div class="addTime">创建时间：</div>
+          <!--
           <a-range-picker
               :show-time="{ format: 'HH:mm' }"
               :disabled-date="disabledDate" :disabled-time="disabledRangeTime" 
@@ -53,7 +54,9 @@
               style="border-radius: 8px; height: 40px; margin-left: 5px"
               :placeholder="['      开始时间', '        结束时间']"
 
-          />
+          />-->
+          <a-range-picker v-model:value="searchParam.valueDate" style="width: 420px" format="YYYY-MM-DD" separator="至"
+								:placeholder="['      开始时间', '        结束时间']" />
         </div>
         <div style="display: flex; margin-bottom: 20px">
           <div class="btnn btn1" @click="searchSubmit">

vue.config.js

@@ -9,7 +9,7 @@
 const { defineConfig } = require("@vue/cli-service");
 
 module.exports = defineConfig({
-	publicPath: "/manage",
+	publicPath: process.env.VUE_APP_BASE,
 	// transpileDependencies: true,
 	devServer: {
 		port: 8080,