Parcourir la source

学生信息管理添加筛选条件

hzj18279462576@163.com il y a 10 mois
Parent
commit
aca3e9e86f
3 fichiers modifiés avec 29 ajouts et 13 suppressions
  1. 2 2
      src/utils/request.js
  2. 15 0
      src/views/studentInfo/studentInfo.vue
  3. 12 11
      vite.config.js

+ 2 - 2
src/utils/request.js

@@ -70,8 +70,8 @@ export const request = (
   });
   });
 };
 };
 
 
-// const api = "/welcome/welcome_api"; // 代理地址
-const api = "/welcome/api"; // 代理地址
+const api = "/welcome/welcome_api"; // 代理地址
+// const api = "/welcome/api"; // 代理地址
 // 请求封装
 // 请求封装
 export const https = {
 export const https = {
   get(url, flag, params = {}) {
   get(url, flag, params = {}) {

+ 15 - 0
src/views/studentInfo/studentInfo.vue

@@ -91,6 +91,17 @@
             </el-select>
             </el-select>
           </div>
           </div>
           <div class="condition">
           <div class="condition">
+            <span>是否入住 :</span>
+            <el-select
+              clearable
+              v-model="searchInput.isCheck"
+              placeholder="请选择"
+            >
+              <el-option label="已入住" value="1" />
+              <el-option label="未入住" value="0" />
+            </el-select>
+          </div>
+          <div class="condition">
             <span>现场报到 :</span>
             <span>现场报到 :</span>
             <el-select
             <el-select
               clearable
               clearable
@@ -1428,6 +1439,7 @@ const searchInput = reactive({
   trafficMethod: "",
   trafficMethod: "",
   fillStatus: "",
   fillStatus: "",
   isPay:"",
   isPay:"",
+  isCheck:"",
   name: "",
   name: "",
   isRegistered:"",
   isRegistered:"",
 }); // 搜索按钮数据
 }); // 搜索按钮数据
@@ -2025,6 +2037,7 @@ const getList = async () => {
     name: searchInput.name,
     name: searchInput.name,
     fillStatus: searchInput.fillStatus,
     fillStatus: searchInput.fillStatus,
     isPay:searchInput.isPay,
     isPay:searchInput.isPay,
+    isCheck:searchInput.isCheck,
     isRegistered: searchInput.isRegistered,
     isRegistered: searchInput.isRegistered,
   };
   };
   console.log(params);
   console.log(params);
@@ -2065,6 +2078,7 @@ const resetBtn = lodash.debounce(async () => {
   searchInput.name = null;
   searchInput.name = null;
   searchInput.fillStatus = null;
   searchInput.fillStatus = null;
   searchInput.isPay=null;
   searchInput.isPay=null;
+  searchInput.isCheck=null;
   searchInput.isRegistered = null;
   searchInput.isRegistered = null;
   getList();
   getList();
 }, 300);
 }, 300);
@@ -2753,6 +2767,7 @@ const buildExportbtn = async () => {
     name: searchInput.name,
     name: searchInput.name,
     fillStatus: searchInput.fillStatus,
     fillStatus: searchInput.fillStatus,
     isPay:searchInput.isPay,
     isPay:searchInput.isPay,
+    isCheck:searchInput.isCheck,
     isRegistered: searchInput.isRegistered,
     isRegistered: searchInput.isRegistered,
   };
   };
   let res = await https.getBlob(
   let res = await https.getBlob(

+ 12 - 11
vite.config.js

@@ -30,21 +30,22 @@ export default defineConfig({
     port: 8585,
     port: 8585,
     // 是否开启 https
     // 是否开启 https
     // https: false,
     // https: false,
-    // proxy: {
-    //   "/welcome/welcome_api": {
-    //     target: "https://chtech.ncjti.edu.cn/welcome/welcome_api", // 线上环境
-    //     changeOrigin: true,
-    //     rewrite: (path) => path.replace(/^\/welcome\/welcome_api/, ""),
-    //   },
-    // },
-    
+
     proxy: {
     proxy: {
-      "/welcome/api": {
-        target: "http://192.168.161.190:8080", // 线上环境
+      "/welcome/welcome_api": {
+        target: "https://chtech.ncjti.edu.cn/welcome/welcome_api", // 线上环境
         changeOrigin: true,
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/welcome\/api/, ""),
+        rewrite: (path) => path.replace(/^\/welcome\/welcome_api/, ""),
       },
       },
     },
     },
+
+    // proxy: {
+    //   "/welcome/api": {
+    //     target: "http://192.168.161.190:8080", // 线上环境
+    //     changeOrigin: true,
+    //     rewrite: (path) => path.replace(/^\/welcome\/api/, ""),
+    //   },
+    // },
   },
   },
   publicDir: "public",
   publicDir: "public",
   base: "./",
   base: "./",