From b37caa4abf93dfa0ce4dad9e7736976954f56efc Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 2 Apr 2025 10:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                  |   2 +-
 src/views/Area/Area.vue               |  31 ++
 src/views/Area/components/AddArea.vue | 389 +++++++++++++-------------
 src/views/Batch/Batch.vue             |   2 +
 vue.config.js                         |   2 +-
 5 files changed, 231 insertions(+), 195 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index ab840ea..315dcd4 100644
--- a/src/utils/request.js
+++ b/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
 })
 
diff --git a/src/views/Area/Area.vue b/src/views/Area/Area.vue
index 5cdd284..369212f 100644
--- a/src/views/Area/Area.vue
+++ b/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: {},
     };
diff --git a/src/views/Area/components/AddArea.vue b/src/views/Area/components/AddArea.vue
index 03f1af9..a206cf1 100644
--- a/src/views/Area/components/AddArea.vue
+++ b/src/views/Area/components/AddArea.vue
@@ -1,194 +1,197 @@
-<template>
-  <div>
-    <el-drawer
-      :title="$route.meta.title"
-      direction="rtl"
-      size="68%"
-      :visible.sync="visible"
-      append-to-body
-      :before-close="handleClose"
-      @close="$emit('update:isShow', false)"
-    >
-      <section class="drawer-container">
-        <el-form
-          class="drawer-container__form"
-          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
-                v-model="form['name']"
-                clearable
-                placeholder="请填写名称"
-                style="width: 100%"
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item label="分组" prop="group">
-              <el-input
-                v-model="form['group']"
-                clearable
-                placeholder="请填写分组"
-                style="width: 100%"
-              ></el-input>
-            </el-form-item>
-          </div>
-        </el-form>
-
-        <div class="drawer-container__footer">
-          <el-button @click="reset">重 置</el-button>
-          <el-button type="primary" @click="submit" :loading="loading">{{
-            loading ? "提交中 ..." : "确 定"
-          }}</el-button>
-        </div>
-      </section>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-import { save, show } from "@/api/area/area";
-import axios from "axios";
-import { getToken } from "@/utils/auth";
-import { uploadSize } from "@/settings";
-import { formatFileSize } from "@/utils";
-
-export default {
-  name: "AreaDrawer",
-  props: {
-    isShow: {
-      type: Boolean,
-      default: false,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      uploadSize,
-      action: process.env.VUE_APP_UPLOAD_API,
-      loading: false,
-      visible: false,
-      form: {
-        name: "",
-
-        group: "",
-      },
-      rules: {},
-    };
-  },
-  watch: {
-    isShow(newVal) {
-      this.visible = newVal;
-    },
-    visible(newVal) {
-      this.$emit("update:isShow", newVal);
-    },
-  },
-  methods: {
-    uploadBefore(file) {
-      if (file.size > uploadSize) {
-        this.$message({
-          type: "warning",
-          message: `上传图片大小超过${formatFileSize(uploadSize)}！`,
-        });
-        return false;
-      }
-      window.$_uploading = true;
-    },
-    uploadSuccess(response, file, fileList, fieldName) {
-      window.$_uploading = false;
-      fileList.forEach((file) => {
-        if (file.response?.data && !file.response?.code) {
-          file.response = file.response.data;
-        }
-      });
-      this.form[fieldName] = fileList;
-    },
-    uploadRemove(file, fileList, fieldName) {
-      this.form[fieldName] = fileList;
-    },
-    uploadError(err, file, fileList, fieldName) {
-      window.$_uploading = false;
-      this.form[fieldName] = fileList;
-      this.$message({
-        type: "warning",
-        message: err,
-      });
-    },
-    formatFileSize,
-    getToken,
-    handleClose(done) {
-      this.$confirm("确定关闭窗口？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
-    },
-
-    reset() {
-      this.form = {
-        name: "",
-
-        group: "",
-      };
-      this.$refs["elForm"].resetFields();
-    },
-    submit() {
-      if (window.$_uploading) {
-        this.$message.warning("文件正在上传中");
-        return;
-      }
-
-      this.$refs["elForm"].validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          try {
-            await save(this.form);
-            this.$message.success("新增成功");
-            this.$emit("refresh");
-            this.$emit("update:isShow", false);
-            this.loading = false;
-            this.reset();
-          } catch (err) {
-            this.loading = false;
-          }
-        }
-      });
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.span2 {
-  grid-column: span 2;
-}
-::v-deep .el-form-item > * {
-  max-width: 100%;
-}
-.form-layout {
-  display: grid;
-  grid-gap: 2%;
-  grid-template-columns: repeat(2, 1fr);
-}
-.drawer-container {
-  height: 100%;
-  padding: 20px;
-  display: flex;
-  flex-direction: column;
-
-  &__form {
-    flex: 1;
-    overflow-y: scroll;
-  }
-  &__footer {
-    margin-top: 20px;
-    display: flex;
-  }
-}
+<template>
+  <div>
+    <el-drawer :title="$route.meta.title" direction="rtl" size="68%" :visible.sync="visible" append-to-body
+      :before-close="handleClose" @close="$emit('update:isShow', false)">
+      <section class="drawer-container">
+        <el-form class="drawer-container__form" 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 v-model="form['name']" clearable placeholder="请填写名称" style="width: 100%"></el-input>
+            </el-form-item>
+
+            <el-form-item label="分组" prop="group">
+              <el-input v-model="form['group']" clearable placeholder="请填写分组" style="width: 100%"></el-input>
+            </el-form-item>
+            <el-form-item label="自主招生显示" prop="is_show">
+              <el-select v-model="form['is_show']">
+                <el-option v-for="item in showList" :key="item.id" :label="item.value"
+                  :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-form>
+
+        <div class="drawer-container__footer">
+          <el-button @click="reset">重 置</el-button>
+          <el-button type="primary" @click="submit" :loading="loading">{{
+            loading ? "提交中 ..." : "确 定"
+          }}</el-button>
+        </div>
+      </section>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+  import {
+    save,
+    show
+  } from "@/api/area/area";
+  import axios from "axios";
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    uploadSize
+  } from "@/settings";
+  import {
+    formatFileSize
+  } from "@/utils";
+
+  export default {
+    name: "AreaDrawer",
+    props: {
+      isShow: {
+        type: Boolean,
+        default: false,
+        required: true,
+      },
+    },
+    data() {
+      return {
+        uploadSize,
+        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: {},
+      };
+    },
+    watch: {
+      isShow(newVal) {
+        this.visible = newVal;
+      },
+      visible(newVal) {
+        this.$emit("update:isShow", newVal);
+      },
+    },
+    methods: {
+      uploadBefore(file) {
+        if (file.size > uploadSize) {
+          this.$message({
+            type: "warning",
+            message: `上传图片大小超过${formatFileSize(uploadSize)}！`,
+          });
+          return false;
+        }
+        window.$_uploading = true;
+      },
+      uploadSuccess(response, file, fileList, fieldName) {
+        window.$_uploading = false;
+        fileList.forEach((file) => {
+          if (file.response?.data && !file.response?.code) {
+            file.response = file.response.data;
+          }
+        });
+        this.form[fieldName] = fileList;
+      },
+      uploadRemove(file, fileList, fieldName) {
+        this.form[fieldName] = fileList;
+      },
+      uploadError(err, file, fileList, fieldName) {
+        window.$_uploading = false;
+        this.form[fieldName] = fileList;
+        this.$message({
+          type: "warning",
+          message: err,
+        });
+      },
+      formatFileSize,
+      getToken,
+      handleClose(done) {
+        this.$confirm("确定关闭窗口？")
+          .then((_) => {
+            done();
+          })
+          .catch((_) => {});
+      },
+
+      reset() {
+        this.form = {
+          name: "",
+
+          group: "",
+        };
+        this.$refs["elForm"].resetFields();
+      },
+      submit() {
+        if (window.$_uploading) {
+          this.$message.warning("文件正在上传中");
+          return;
+        }
+
+        this.$refs["elForm"].validate(async (valid) => {
+          if (valid) {
+            this.loading = true;
+            try {
+              await save(this.form);
+              this.$message.success("新增成功");
+              this.$emit("refresh");
+              this.$emit("update:isShow", false);
+              this.loading = false;
+              this.reset();
+            } catch (err) {
+              this.loading = false;
+            }
+          }
+        });
+      },
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  .span2 {
+    grid-column: span 2;
+  }
+
+  ::v-deep .el-form-item>* {
+    max-width: 100%;
+  }
+
+  .form-layout {
+    display: grid;
+    grid-gap: 2%;
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  .drawer-container {
+    height: 100%;
+    padding: 20px;
+    display: flex;
+    flex-direction: column;
+
+    &__form {
+      flex: 1;
+      overflow-y: scroll;
+    }
+
+    &__footer {
+      margin-top: 20px;
+      display: flex;
+    }
+  }
 </style>
diff --git a/src/views/Batch/Batch.vue b/src/views/Batch/Batch.vue
index e90c642..3ff536d 100644
--- a/src/views/Batch/Batch.vue
+++ b/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',
diff --git a/vue.config.js b/vue.config.js
index c24091f..f9f2874 100644
--- a/vue.config.js
+++ b/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 传递选项