区域

src/utils/request.js

@@ -14,7 +14,7 @@ let loading ;
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000, // request timeout
+  timeout: 10000, // request timeout
   isLoading:true
 })
 

src/views/Area/Area.vue

@@ -101,6 +101,29 @@
           :edit-render="{ name: 'input', attrs: { type: 'text' } }"
         />
 
+        <vxe-column
+          header-align="center"
+          field="is_show"
+          width="160"
+          title="自主招生显示"
+          :edit-render="{}"
+        >
+        <template #default="{ row }">
+          <div v-for="item in showList">
+            <div v-if="item.id==row.is_show">{{item.value}}</div>
+          </div>
+        </template>
+        <template #edit="{ row }">
+          <el-select size="small" v-model="row['is_show']">
+            <el-option
+              v-for="item in showList"
+              :key="item.id"
+              :value="item.id"
+              :label="item.value"></el-option>
+          </el-select>
+        </template>
+        </vxe-column>
+
         <vxe-column
           field="operate"
           header-align="center"
@@ -206,6 +229,13 @@ export default {
 
       loading: false,
       tableHeight: 400,
+      showList: [{
+        id: 1,
+        value: '是'
+      }, {
+        id: 0,
+        value: '否'
+      }],
       select: {
         page: 1,
         page_size: 20,
@@ -221,6 +251,7 @@ export default {
         name: "",
 
         group: "",
+        is_show:''
       },
       validRules: {},
     };

src/views/Area/components/AddArea.vue

@@ -1,41 +1,23 @@
 <template>
   <div>
-    <el-drawer
+    <el-drawer :title="$route.meta.title" direction="rtl" size="68%" :visible.sync="visible" append-to-body
-      :title="$route.meta.title"
+      :before-close="handleClose" @close="$emit('update:isShow', false)">
-      direction="rtl"
-      size="68%"
-      :visible.sync="visible"
-      append-to-body
-      :before-close="handleClose"
-      @close="$emit('update:isShow', false)"
-    >
       <section class="drawer-container">
-        <el-form
+        <el-form class="drawer-container__form" ref="elForm" :model="form" :rules="rules" label-position="top"
-          class="drawer-container__form"
+          label-width="120px" size="small">
-          ref="elForm"
-          :model="form"
-          :rules="rules"
-          label-position="top"
-          label-width="120px"
-          size="small"
-        >
           <div class="form-layout">
             <el-form-item label="名称" prop="name">
-              <el-input
+              <el-input v-model="form['name']" clearable placeholder="请填写名称" style="width: 100%"></el-input>
-                v-model="form['name']"
-                clearable
-                placeholder="请填写名称"
-                style="width: 100%"
-              ></el-input>
             </el-form-item>
 
             <el-form-item label="分组" prop="group">
-              <el-input
+              <el-input v-model="form['group']" clearable placeholder="请填写分组" style="width: 100%"></el-input>
-                v-model="form['group']"
+            </el-form-item>
-                clearable
+            <el-form-item label="自主招生显示" prop="is_show">
-                placeholder="请填写分组"
+              <el-select v-model="form['is_show']">
-                style="width: 100%"
+                <el-option v-for="item in showList" :key="item.id" :label="item.value"
-              ></el-input>
+                  :value="item.id"></el-option>
+              </el-select>
             </el-form-item>
           </div>
         </el-form>
@@ -52,13 +34,22 @@
 </template>
 
 <script>
-import { save, show } from "@/api/area/area";
+  import {
-import axios from "axios";
+    save,
-import { getToken } from "@/utils/auth";
+    show
-import { uploadSize } from "@/settings";
+  } from "@/api/area/area";
-import { formatFileSize } from "@/utils";
+  import axios from "axios";
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    uploadSize
+  } from "@/settings";
+  import {
+    formatFileSize
+  } from "@/utils";
 
-export default {
+  export default {
     name: "AreaDrawer",
     props: {
       isShow: {
@@ -73,10 +64,18 @@ export default {
         action: process.env.VUE_APP_UPLOAD_API,
         loading: false,
         visible: false,
+        showList: [{
+          id: 1,
+          value: '是'
+        }, {
+          id: 0,
+          value: '否'
+        }],
         form: {
           name: "",
 
           group: "",
+          is_show: 1
         },
         rules: {},
       };
@@ -161,22 +160,25 @@ export default {
         });
       },
     },
-};
+  };
 </script>
 
 <style scoped lang="scss">
-.span2 {
+  .span2 {
     grid-column: span 2;
-}
+  }
-::v-deep .el-form-item > * {
+
+  ::v-deep .el-form-item>* {
     max-width: 100%;
-}
+  }
-.form-layout {
+
+  .form-layout {
     display: grid;
     grid-gap: 2%;
     grid-template-columns: repeat(2, 1fr);
-}
+  }
-.drawer-container {
+
+  .drawer-container {
     height: 100%;
     padding: 20px;
     display: flex;
@@ -186,9 +188,10 @@ export default {
       flex: 1;
       overflow-y: scroll;
     }
+
     &__footer {
       margin-top: 20px;
       display: flex;
     }
-}
+  }
 </style>

src/views/Batch/Batch.vue

@@ -357,6 +357,8 @@ export default {
         page: 1,
         page_size: 20,
         keyword: "",
+        sort_type:'ASC',
+        sort_name:'sort',
         show_relation: ["aspiration", "batchSubs"],
         "filter[0][key]": 'aspiration_id',
         "filter[0][op]": 'eq',

vue.config.js

@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: `../git-store/zhiyuan/public/${process.env.ENV === 'staging' ? '/admin_test' : '/admin'}`,
+  outputDir: `/Users/mac/Documents/朗业/2025/x-新飞跃/zhiyuan/public/${process.env.ENV === 'staging' ? '/admin_test' : '/admin'}`,
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项