소스 검색

no message

xiaoxin 1 년 전
부모
커밋
312c076c21

+ 1 - 1
.env.production

@@ -1,7 +1,7 @@
 # 生产环境自定义的环境变量(命名必须以 VITE_ 开头)
 
 ## 后端接口公共路径(如果解决跨域问题采用 CORS 就需要写全路径)
-VITE_BASE_API = 'https://chtech.ncjti.edu.cn/alumnus/alumni_api'
+VITE_BASE_API = 'https://chtech.ncjti.edu.cn/alumnus/alumni_api/alumni/api'
 
 ## 路由模式 hash 或 html5
 VITE_ROUTER_HISTORY = 'hash'

+ 2 - 0
src/layouts/components/Hamburger/index.vue

@@ -24,6 +24,7 @@ const toggleClick = () => {
       <Expand v-else />
     </el-icon>
     <span class="title">{{ VITE_APP_TITLE }}</span>
+    <el-link type="primary" href="https://jtishfw.ncjti.edu.cn/donation/" target="blank">校友捐赠</el-link>
   </div>
 </template>
 
@@ -36,6 +37,7 @@ const toggleClick = () => {
 
 .title {
   margin-left: 15px;
+  margin-right: 30px;
   font-size: 36px;
   font-weight: 500;
   color: var(--v3-hamburger-text-color);

+ 1 - 1
src/layouts/components/NavigationBar/index.vue

@@ -37,7 +37,7 @@ onUnmounted(() => {
     <div class="right-menu">
       <div class="right-menu-item right-menu-avatar">
         <span class="time">{{ datetime }}</span>
-        <el-avatar src="/src/assets/layouts/admin.png" :size="53" />
+        <el-avatar src="@/assets/layouts/admin.png" :size="53" />
         <span>{{ userStore.account }}</span>
         <span>|</span>
         <span @click="logout" class="logout">

+ 14 - 6
src/views/alumni-management/index.vue

@@ -150,10 +150,10 @@ const getQueryUsersPage = () => {
 const handleSearch = () => {
   paginationData.currentPage === 1 ? getQueryUsersPage() : (paginationData.currentPage = 1)
 }
-// const resetSearch = () => {
-//   searchFormRef.value?.resetFields()
-//   handleSearch()
-// }
+const resetSearch = () => {
+  searchFormRef.value?.resetFields()
+  handleSearch()
+}
 //#endregion
 
 /** 监听分页参数的变化 */
@@ -195,6 +195,7 @@ onMounted(() => {
               @change="getQueryMajors"
               clearable
               style="width: 120px"
+              :disabled="!searchData.college"
             >
               <el-option v-for="item in searchData.periodOptions" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
@@ -206,18 +207,25 @@ onMounted(() => {
               @change="getQueryClasses"
               clearable
               style="width: 150px"
+              :disabled="!searchData.period"
             >
               <el-option v-for="item in searchData.majorOptions" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
           <el-form-item prop="class" label="班级">
-            <el-select v-model="searchData.class" placeholder="请选择" clearable style="width: 130px">
+            <el-select
+              v-model="searchData.class"
+              placeholder="请选择"
+              clearable
+              style="width: 130px"
+              :disabled="!searchData.major"
+            >
               <el-option v-for="item in searchData.classOptions" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch">查询</el-button>
-            <!-- <el-button @click="resetSearch" plain>重置</el-button> -->
+            <el-button @click="resetSearch" plain>重置</el-button>
           </el-form-item>
         </el-form>
       </div>

+ 14 - 6
src/views/alumni-organization/audit-list.vue

@@ -221,10 +221,10 @@ const getCurrentDateTime = () => {
 const handleSearch = () => {
   paginationData.currentPage === 1 ? getTableData() : (paginationData.currentPage = 1)
 }
-// const resetSearch = () => {
-//   searchFormRef.value?.resetFields()
-//   handleSearch()
-// }
+const resetSearch = () => {
+  searchFormRef.value?.resetFields()
+  handleSearch()
+}
 //#endregion
 
 /** 监听分页参数的变化 */
@@ -316,6 +316,7 @@ onBeforeMount(() => {
               @change="getQueryMajors"
               clearable
               style="width: 178px"
+              :disabled="!searchData.college"
             >
               <el-option v-for="item in searchData.periodOptions" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
@@ -327,12 +328,19 @@ onBeforeMount(() => {
               @change="getQueryClasses"
               clearable
               style="width: 178px"
+              :disabled="!searchData.period"
             >
               <el-option v-for="item in searchData.majorOptions" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
           <el-form-item prop="class" label="班级">
-            <el-select v-model="searchData.class" placeholder="请选择" clearable style="width: 178px">
+            <el-select
+              v-model="searchData.class"
+              placeholder="请选择"
+              clearable
+              style="width: 178px"
+              :disabled="!searchData.major"
+            >
               <el-option v-for="item in searchData.classOptions" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -347,7 +355,7 @@ onBeforeMount(() => {
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch">查询</el-button>
-            <!-- <el-button @click="resetSearch" plain>重置</el-button> -->
+            <el-button @click="resetSearch" plain>重置</el-button>
             <el-button plain @click="handleDownload">导出</el-button>
           </el-form-item>
         </el-form>

+ 6 - 6
src/views/alumni-organization/classification-management.vue

@@ -105,10 +105,10 @@ const getTableData = () => {
 const handleSearch = () => {
   paginationData.currentPage === 1 ? getTableData() : (paginationData.currentPage = 1)
 }
-// const resetSearch = () => {
-//   searchFormRef.value?.resetFields()
-//   handleSearch()
-// }
+const resetSearch = () => {
+  searchFormRef.value?.resetFields()
+  handleSearch()
+}
 //#endregion
 
 /** 监听分页参数的变化 */
@@ -137,7 +137,7 @@ watch([() => paginationData.currentPage, () => paginationData.pageSize], getTabl
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch">查询</el-button>
-            <!-- <el-button @click="resetSearch" plain>重置</el-button> -->
+            <el-button @click="resetSearch" plain>重置</el-button>
           </el-form-item>
         </el-form>
         <div>
@@ -149,7 +149,7 @@ watch([() => paginationData.currentPage, () => paginationData.pageSize], getTabl
           <el-table-column type="index" label="序号" width="100" align="center" />
           <el-table-column prop="name" label="分类名称" align="center" />
           <el-table-column prop="createTime" label="创建时间" align="center" />
-          <el-table-column prop="createUserName" label="创建人" align="center" />
+          <el-table-column prop="createUser" label="创建人" align="center" />
           <el-table-column fixed="right" label="操作" width="200" align="center">
             <template #default="scope">
               <el-link type="primary" @click="handleUpdate(scope.row)">编辑</el-link>

+ 5 - 5
src/views/alumni-organization/index.vue

@@ -255,10 +255,10 @@ const getQueryOrgTree = () => {
 const handleSearch = () => {
   paginationData.currentPage === 1 ? getTableData() : (paginationData.currentPage = 1)
 }
-// const resetSearch = () => {
-//   searchFormRef.value?.resetFields()
-//   handleSearch()
-// }
+const resetSearch = () => {
+  searchFormRef.value?.resetFields()
+  handleSearch()
+}
 //#endregion
 
 /** 监听分页参数的变化 */
@@ -372,7 +372,7 @@ onBeforeMount(() => {
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch">查询</el-button>
-            <!-- <el-button @click="resetSearch" plain>重置</el-button> -->
+            <el-button @click="resetSearch" plain>重置</el-button>
           </el-form-item>
         </el-form>
         <div>

+ 2 - 2
src/views/login/index.vue

@@ -17,8 +17,8 @@ const loginFormRef = ref(null)
 const loading = ref(false)
 /** 登录表单数据 */
 const loginFormData = reactive({
-  account: "superAdmin",
-  password: "123456"
+  account: "",
+  password: ""
 })
 /** 记住密码 */
 const rememberPassword = ref(false)

+ 4 - 4
vite.config.js

@@ -1,4 +1,4 @@
-import { loadEnv } from "vite"
+// import { loadEnv } from "vite"
 import path, { resolve } from "path"
 import vue from "@vitejs/plugin-vue"
 import { createSvgIconsPlugin } from "vite-plugin-svg-icons"
@@ -6,11 +6,11 @@ import svgLoader from "vite-svg-loader"
 
 /** 配置项文档:https://cn.vitejs.dev/config */
 export default ({ mode }) => {
-  const viteEnv = loadEnv(mode, process.cwd())
-  const { VITE_PUBLIC_PATH } = viteEnv
+  // const viteEnv = loadEnv(mode, process.cwd())
+  // const { VITE_PUBLIC_PATH } = viteEnv
   return {
     /** 打包时根据实际情况修改 base */
-    base: VITE_PUBLIC_PATH,
+    base: "/alumnus/alumniWeb/",
     resolve: {
       alias: {
         /** @ 符号指向 src 目录 */