diff --git a/.env.prod b/.env.prod index 40aef55d..58745c09 100644 --- a/.env.prod +++ b/.env.prod @@ -10,7 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading -VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit +VUE_APP_IFRAME_TEACHER_URL=//u.boe.com/pc/need/waitaudit VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id= diff --git a/.env.release b/.env.release index d54ac429..185c9dc5 100644 --- a/.env.release +++ b/.env.release @@ -10,7 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com VUE_APP_IFRAME_URL=//u.boe.com/pc-release/iframe VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc-release/loading -VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc-release/need/waitaudit +VUE_APP_IFRAME_TEACHER_URL=//u.boe.com/pc-release/need/waitaudit VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id= diff --git a/src/App.vue b/src/App.vue index 3fc4fc8e..e0773761 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本1.4.1------------"); +console.log("版本1.4.2------------"); // 监听关闭浏览器 let time1 = ref(0); diff --git a/src/assets/images/courseManage/reset4.png b/src/assets/images/courseManage/reset4.png new file mode 100644 index 00000000..00e85114 Binary files /dev/null and b/src/assets/images/courseManage/reset4.png differ diff --git a/src/assets/images/leveladd/delete1.png b/src/assets/images/leveladd/delete1.png new file mode 100644 index 00000000..b51497f3 Binary files /dev/null and b/src/assets/images/leveladd/delete1.png differ diff --git a/src/assets/images/leveladd/reset0.png b/src/assets/images/leveladd/reset0.png new file mode 100644 index 00000000..e9f628fa Binary files /dev/null and b/src/assets/images/leveladd/reset0.png differ diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 6952daf9..60467d03 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -86,11 +86,11 @@ -
+
签到二维码
-
+
批量签到
@@ -274,6 +274,7 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode"; import * as api from "../../api/indexTaskManage"; import { toDate } from "../../api/method"; import { message } from "ant-design-vue"; +import {checkPer} from "@/utils/utils"; export default { name: "ActiveAttendance", components: { @@ -281,6 +282,14 @@ export default { TwoDimensionalCode, }, props: { + createId: { + type: Number, + default: null, + }, + permissions: { + type: String, + default: null, + }, AAvisible: { type: Boolean, default: false, @@ -782,6 +791,7 @@ export default { align: "center", customRender: (value) => { return ( + checkPer(props.permissions,props.createId)?
请假
+ :'' ); }, }, @@ -1022,6 +1033,7 @@ export default { tableDataFunc, clearLine, showqdModal, + checkPer, closeqdModal, showsingleqdModal, showsingleqtModal, @@ -1145,7 +1157,7 @@ export default { .img2 { width: 16px; height: 18px; - background-image: url(../../assets/images/courseManage/reset1.png); + background-image: url(../../assets/images/courseManage/reset0.png); background-size: 100% 100%; margin-right: 7px; } @@ -1158,9 +1170,9 @@ export default { } .btn2 { - background: #ffffff; + background: #4ea6ff; - color: #4ea6ff; + color: #fff; border: 1px solid #4ea6ff; } } diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 8f668a16..d14fcfcf 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -76,6 +76,7 @@
活动开始前: - +
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 5c14abea..ce744440 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -109,7 +109,7 @@
- +
@@ -361,42 +361,42 @@ defineExpose({ openDrawer }); } .btn2 { - background: rgb(255, 255, 255); + background: rgb(64, 158, 255); .search { width: 15px; height: 17px; - background-image: url("@/assets/images/coursewareManage/reset1.png"); + background-image: url("@/assets/images/coursewareManage/reset0.png"); } .btnText { - color: rgb(64, 158, 255); + color: rgb(255, 255, 255); } } - .btn1:hover { - background: rgb(255, 255, 255); + // .btn1:hover { + // background: rgb(255, 255, 255); - .search { - background-image: url("@/assets/images/courseManage/search1.png"); - } + // .search { + // background-image: url("@/assets/images/courseManage/search1.png"); + // } - .btnText { - color: #4ea6ff; - } - } + // .btnText { + // color: #4ea6ff; + // } + // } - .btn2:hover { - background: rgba(64, 158, 255, 1); + // .btn2:hover { + // background: rgba(64, 158, 255, 1); - .search { - background-image: url("@/assets/images/courseManage/reset0.png"); - } + // .search { + // background-image: url("@/assets/images/courseManage/reset0.png"); + // } - .btnText { - color: #ffffff; - } - } + // .btnText { + // color: #ffffff; + // } + // } } } diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index c1b7185e..0aebf024 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -71,7 +71,7 @@
- +
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 41f726fc..efe1c1f1 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -105,7 +105,7 @@
- +
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index a1b2a248..788014a5 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -126,7 +126,7 @@
开始前:
-
{{ edit ? "编辑" : "添加" }}任务
+
{{ edit ? "编辑" : "添加" }}作业
@@ -80,7 +80,7 @@
- 取消 + 取消 确定
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 93c7c364..9c069d9b 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -18,7 +18,7 @@
- +
diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index 55ba0b65..a3ed6938 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -170,7 +170,7 @@
- +
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index a9a1a555..a75b3c4c 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -60,7 +60,7 @@ 直播时长:
- 分钟
@@ -158,7 +158,7 @@
直播开始前: - 直播开始后: - - +
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 4968e619..2fd642be 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -11,7 +11,7 @@ >
-
{{ taskIndex === -1 ? "编辑" : "添加" }}任务
+
{{ taskIndex >= 0 ? "编辑" : "添加" }}在线
@@ -34,7 +34,7 @@ />
- +
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 68e63583..32e3f3c7 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -143,7 +143,7 @@
- +
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index 94a8c1e4..9cca5aeb 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -75,7 +75,7 @@
- +
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 58009db8..a26104a2 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -96,7 +96,7 @@ 考试时长:
- 分钟 @@ -133,7 +133,7 @@
允许重复考试: - = 0 && isEdit" :min="-1" :max="999999" :precision="0" style=" width: 100px; height: 32px; border-radius: 8px; @@ -235,7 +235,7 @@
- 取消 + 取消 确定
diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue index 8384985c..43919605 100644 --- a/src/components/drawers/AssessmentAll.vue +++ b/src/components/drawers/AssessmentAll.vue @@ -192,7 +192,7 @@ function reset() { const goResearchmanage = () => { // router.push({ path: "/researchmanage" }); - window.open(process.env.VUE_APP_BASE + "/researchmanage"); + window.open(process.env.VUE_APP_BASE + "/researchmanage?openCreate=true"); };