Merge branch 'Inspection' into online

src/views/main/teamSchedule/compontent/taskInfo.vue

@@ -29,7 +29,7 @@
           value-format="HH:mm"
           placeholder="选择时间范围"
           :picker-options="{
-            selectableRange: `04:00:00-23:59:00`,
+            selectableRange: `07:00:00-22:00:00`,
           }"
         >
         </el-time-picker>
@@ -47,7 +47,7 @@
           placeholder="选择时间范围"
           :disabled='!taskForm.startTimer'
           :picker-options="{
-            selectableRange: `${taskForm.startTimer}:00-23:59:00`,
+            selectableRange: `${taskForm.startTimer}:00-22:00:00`,
           }"
         >
         </el-time-picker>

src/views/main/teamSchedule/scheduleDetail.vue

@@ -100,7 +100,7 @@ export default {
   },
   data() {
     return {
-      timerImg: require("@/views/teacherManager/teacherDetail/components/weekUitl/weekTimer.png"),
+      timerImg: require("@/views/main/teamSchedule/compontent/weekTimer.png"),
       active: -1,
       week: new Date(),
       weekList: [],
@@ -179,7 +179,8 @@ export default {
       let startMinutes = this.getMinutes(row.planStart.split(" ")[1]);
       let endMinutes = this.getMinutes(row.planEnd.split(" ")[1]);
       let width = (endMinutes - startMinutes) * 1.8;
-      let left = startMinutes - 240 > 0 ? (startMinutes - 240) * 1.8 + 17 : 17;
+      //7点开始  7*60= 420 分钟 每分钟1.8像素 17像素是图片的时间的起始点
+      let left = startMinutes - 420 > 0 ? (startMinutes - 420) * 1.8 + 17 : 17;
       let top =
         getWeekDay(row.planStart) === 1
           ? 40
@@ -196,7 +197,6 @@ export default {
     setWeekList() {
       this.weekList = [];
       let startTime = new Date(this.startTime.replace(/-/g, "/"));
-
       startTime.setTime(startTime.getTime() - 1000 * 60 * 60 * 24);
       for (let i = 0; i < 7; i++) {
         startTime.setTime(startTime.getTime() + 1000 * 60 * 60 * 24);
@@ -331,11 +331,11 @@ export default {
     overflow: auto;
     position: relative;
     .imgWrap {
-      width: 2194px;
+      width: 1659px;
       position: relative;
       z-index: 1;
       img {
-        width: 2194px;
+        width: 1659px;
         position: relative;
         z-index: 1;
       }