lideyin 6 gadi atpakaļ
vecāks
revīzija
cde6452918

+ 1 - 1
.env.development

@@ -1,6 +1,6 @@
 #### 如果需要改变以下环境变量的值,请在根目录下新增 .env.local 文件,里面设置的变量会覆盖本文件
 VUE_APP_CORE_HOST_URL=http://192.168.10.39:8000
-VUE_APP_EXAM_WORK_HOST_URL=http://192.168.10.39:8001
+VUE_APP_EXAM_WORK_HOST_URL=http://192.168.10.125:8001
 VUE_APP_QUESTIONS_HOST_URL=http://192.168.10.39:8008
 VUE_APP_OE_HOST_URL=http://192.168.10.39:8013
 VUE_APP_MARKING_HOST_URL=http://192.168.10.39:8004

+ 13 - 0
src/constants/constants.js

@@ -55,3 +55,16 @@ export const BASIC_DATA_TYPE = [
   { code: "LONG", name: "LONG" },
   { code: "DATE", name: "DATE" }
 ];
+//发布状态
+export const PUBLISH_STATUS = [
+  { code: "UNPUBLISHED", name: "未发布" },
+  { code: "PUBLISHING", name: "发布中" },
+  { code: "PUBLISHED", name: "已发布" }
+];
+//公告接受规则类型
+export const NOTICE_RECEIVER_RULE_TYPE = [
+  { code: "STUDENTS_OF_EXAM", name: "归属考试的考生" },
+  { code: "TEACHER_OF_MARK_WORK", name: "评卷老师" },
+  { code: "ALL_STUDENTS_OF_ROOT_ORG", name: "顶级机构下所有学生" },
+  { code: "COMMON_USERS_OF_ROLE", name: "学习中心老师" }
+];

+ 5 - 0
src/modules/examwork/routes/routes.js

@@ -11,6 +11,7 @@ import printExam from "../view/printExam.vue";
 import offlineExamOrgSettings from "../view/offlineExamOrgSettings.vue";
 import onlineExamOrgSettings from "../view/onlineExamOrgSettings.vue";
 import Tips from "../../portal/views/tips/Tips.vue";
+import notice from "../view/notice.vue";
 
 export default [
   {
@@ -69,6 +70,10 @@ export default [
       {
         path: "onlineExamOrgSettings/:id",
         component: onlineExamOrgSettings
+      },
+      {
+        path: "notice",
+        component: notice
       }
     ]
   }

+ 6 - 7
src/modules/marking/views/MarkSettingFast.vue

@@ -347,24 +347,23 @@ export default {
 };
 </script>
 <style lang="css" scoped>
-
 li {
-    list-style-type: none;
+  list-style-type: none;
 }
 
 .searchFrame {
-    margin-right: 10px;
-    margin-bottom: 10px;
+  margin-right: 10px;
+  margin-bottom: 10px;
 }
 
-.page{
+.page {
   margin-top: 10px;
 }
 
-.el-tag{
+.el-tag {
   margin-right: 10px;
 }
-.table-native{
+.table-native {
   width: 700px;
 }
 </style>

+ 3 - 2
vue.config.js

@@ -4,8 +4,9 @@ const proxy = {
     changeOrigin: true
   },
   "/api/ecs_exam_work": {
-    target:
-      process.env.VUE_APP_EXAM_WORK_HOST_URL || "http://192.168.10.39:8001",
+    // target:
+    //   process.env.VUE_APP_EXAM_WORK_HOST_URL || "http://192.168.10.39:8001",
+    target: "http://192.168.10.125:8001",
     changeOrigin: true
   },
   "/api/ecs_outlet": {