md

src/components/base/CourseSelect.vue

@@ -26,7 +26,7 @@ export default {
   name: "course-select",
   props: {
     disabled: { type: Boolean, default: false },
-    placeholder: { type: String, default: "请选择" },
+    placeholder: { type: String, default: "请选择科目" },
     value: { type: [Number, String], default: "" },
     clearable: { type: Boolean, default: true },
     semesterId: { type: String, default: "" },

src/modules/base/views/AssignmentCalculate.vue

@@ -14,6 +14,12 @@
         <el-form-item prop="examTypeId" label="考试类型：">
           <exam-type-select v-model="filter.examTypeId"></exam-type-select>
         </el-form-item>
+        <el-form-item label="学院：">
+          <college-select
+            v-model="filter.collegeId"
+            :disabled="collegeDisabled"
+          ></college-select>
+        </el-form-item>
         <el-form-item label="课程代码：">
           <course-select
             v-model="filter.courseCode"
@@ -80,7 +86,9 @@ export default {
         semesterId: "",
         examTypeId: "",
         courseCode: "",
+        collegeId: "",
       },
+      collegeDisabled: false,
       current: 1,
       size: this.GLOBAL.pageSize,
       total: 0,
@@ -88,6 +96,11 @@ export default {
     };
   },
   async mounted() {
+    const orgId = this.$ls.get("user", { orgId: "" }).orgId;
+    if (orgId) {
+      this.filter.collegeId = orgId;
+      this.collegeDisabled = true;
+    }
     await this.$refs.SemesterSelect.search();
   },
   methods: {
@@ -107,19 +120,18 @@ export default {
       this.getList();
     },
     toCalc(row) {
-      this.$ls.set(
-        "curAssignInfo",
-        this.$objAssign(
-          {
-            semesterId: "",
-            examTypeId: "",
-            courseCode: "",
-            courseName: "",
-            openCollege: "",
-          },
-          row
-        )
+      let curAssignInfo = this.$objAssign(
+        {
+          semesterId: "",
+          examTypeId: "",
+          courseCode: "",
+          courseName: "",
+          openCollege: "",
+        },
+        row
       );
+      curAssignInfo.collegeId = this.filter.collegeId;
+      this.$ls.set("curAssignInfo", curAssignInfo);
       this.$router.push({
         name: "AssignmentCalculateDetail",
       });

vue.config.js

@@ -1,14 +1,18 @@
-// 配置手册： https://cli.vuejs.org/zh/config/#vue-config-js
-const { defineConfig } = require("@vue/cli-service");
-module.exports = defineConfig({
-  transpileDependencies: true,
-  devServer: {
-    port: 8055,
-    proxy: {
-      "/api/": {
-        target: process.env.VUE_APP_DEV_PROXY,
-        changeOrigin: true
-      }
-    }
-  }
-});
+// 配置手册： https://cli.vuejs.org/zh/config/#vue-config-js
+const { defineConfig } = require("@vue/cli-service");
+module.exports = defineConfig({
+  transpileDependencies: true,
+  devServer: {
+    port: 8055,
+    proxy: {
+      "/api/": {
+        target: process.env.VUE_APP_DEV_PROXY,
+        changeOrigin: true,
+      },
+    },
+    // https://webpack.js.org/configuration/dev-server/#overlay
+    client: {
+      overlay: false,
+    },
+  },
+});