修复一下高亮路径问题

1

src/router/notKeepAliveList.js

@@ -12,7 +12,7 @@ export default [
   '/vipClassSet/vipChargeSeting', // VIP课程收费设置
   '/vipClassSet/vipActiveList', // VIP活动方案
   '/vipClassSet/vipNewActive', // VIP活动方案修改
-  '/main/main', // 首页
+  '/workbench', // 首页
   '/main/notClassStudent', // 未在班级学员
   '/journal/journal', // 系统日志
   '/business/accompany', // 网管课管理

src/store/modules/permission.js

@@ -218,7 +218,7 @@ function setDetailRoute(accessedRoutes) {
           noCache: '1',
           title: '日程安排',
           belongTopMenu: "/main",
-          activeMenu: '/main/main',
+          activeMenu: '/workbench',
           id: 'xx1'
         }
       },
@@ -231,7 +231,7 @@ function setDetailRoute(accessedRoutes) {
           noCache: '1',
           title: '未在班级学员',
           belongTopMenu: "/main",
-          activeMenu: '/main/main',
+          activeMenu: '/workbench',
           id: 'xx2'
         }
       },
@@ -244,7 +244,7 @@ function setDetailRoute(accessedRoutes) {
           noCache: '1',
           title: '学员请假列表',
           belongTopMenu: "/main",
-          activeMenu: '/main/main'
+          activeMenu: '/workbench'
         }
       },
       {
@@ -256,7 +256,7 @@ function setDetailRoute(accessedRoutes) {
           noCache: '1',
           title: '乐团会员列表',
           belongTopMenu: "/main",
-          activeMenu: '/main/main'
+          activeMenu: '/workbench'
         }
       },
       {
@@ -268,7 +268,7 @@ function setDetailRoute(accessedRoutes) {
           noCache: '1',
           title: '乐团展演列表',
           belongTopMenu: "/main",
-          activeMenu: '/main/main'
+          activeMenu: '/workbench'
         }
       },
       {
@@ -280,7 +280,7 @@ function setDetailRoute(accessedRoutes) {
           noCache: '1',
           title: '分部团练宝数据详情',
           belongTopMenu: "/main",
-          activeMenu: '/main/main'
+          activeMenu: '/workbench'
         }
       },
       {
@@ -292,7 +292,7 @@ function setDetailRoute(accessedRoutes) {
           noCache: '1',
           title: '分部团练宝排行',
           belongTopMenu: "/main",
-          activeMenu: '/main/main'
+          activeMenu: '/workbench'
         }
       },
         //

src/views/login/index.vue

@@ -166,7 +166,7 @@ export default {
                 //  这里清空 tab
                 this.$store
                   .dispatch("delAllViews")
-                this.$router.push({ path: "/main/main" });
+                this.$router.push({ path: "/workbench" });
 
               })
             })

src/views/main/teamSchedule/scheduleDetail.vue

@@ -16,69 +16,88 @@
       }"
     >
     </el-date-picker>
-    <div class="taskList">
-      <div class="teamDot dotBtn" draggable="true" @click="drop" @dragstart="dragstart($event)">下校巡查</div>
-      <p>任务数量:<span :style="times>activeTotal?'color:red':''">{{activeTotal}}</span>/<span>{{times}}</span></p>
-    </div>
-    <div class="timeWrap">
-      <div class="weekDotList">
-        <!-- @click="setWeekDotList(item, index)" -->
-        <div class="weekDot" v-for="(item, index) in weekList" :key="index">
-          <p class="week">{{ item.week }}</p>
-          <p class="date">{{ item.dateStr }}</p>
+    <div class="m-core" style="margin-top:20px;">
+      <div class="taskList">
+        <div
+          class="teamDot dotBtn"
+          draggable="true"
+          @click="drop"
+          @dragstart="dragstart($event)"
+        >
+          下校巡查
         </div>
+        <p>
+          任务数量:<span :style="times > activeTotal ? 'color:red' : ''">{{
+            activeTotal
+          }}</span
+          >/<span>{{ times }}</span>
+        </p>
       </div>
-      <div class="timer" @drop="drop" @dragover="dragOver($event)">
-        <div class="imgWrap" v-drag>
-          <img :src="timerImg" />
-          <div v-for="(item, index) in taskList" :key="index + 'new'">
-            <el-popover placement="top" trigger="hover">
-              <p>巡查日期:{{ item.planStart | dayjsFormat }}</p>
-              <p>
-                巡查时间:{{ item.planStart | dayjsFormatMinute }}~{{
-                  item.planEnd | dayjsFormatMinute
-                }}
-              </p>
-              <p>巡查乐团:{{ item.musicGroupName }}</p>
-              <div
-                slot="reference"
-                :style="item.style"
-                class="teamDot dot"
-                @click="resetSchedule(item)"
-              >
-                下校巡查
-              </div>
-            </el-popover>
+      <div class="timeWrap">
+        <div class="weekDotList">
+          <!-- @click="setWeekDotList(item, index)" -->
+          <div class="weekDot" v-for="(item, index) in weekList" :key="index">
+            <p class="week">{{ item.week }}</p>
+            <p class="date">{{ item.dateStr }}</p>
+          </div>
+        </div>
+        <div class="timer" @drop="drop" @dragover="dragOver($event)">
+          <div class="imgWrap" v-drag>
+            <img :src="timerImg" />
+            <div v-for="(item, index) in taskList" :key="index + 'new'">
+              <el-popover placement="top" trigger="hover">
+                <p>巡查日期:{{ item.planStart | dayjsFormat }}</p>
+                <p>
+                  巡查时间:{{ item.planStart | dayjsFormatMinute }}~{{
+                    item.planEnd | dayjsFormatMinute
+                  }}
+                </p>
+                <p>巡查乐团:{{ item.musicGroupName }}</p>
+                <div
+                  slot="reference"
+                  :style="item.style"
+                  class="teamDot dot"
+                  @click="resetSchedule(item)"
+                >
+                  下校巡查
+                </div>
+              </el-popover>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-    <el-dialog
-      :title="isNew ? '新增下校巡查' : '修改下校巡查'"
-      width="600px"
-      :visible.sync="taskStatus"
-      v-if="taskStatus"
-    >
-      <taskinfo
-        :taskInfo="activeTask"
-        ref="taskinfo"
-        :rangeStart="rangeStart"
-        :rangeEnd="rangeEnd"
-        :MusicGroupList="MusicGroupList"
-        :itemId="itemId"
-        @refreshList="refreshList"
+      <el-dialog
+        :title="isNew ? '新增下校巡查' : '修改下校巡查'"
+        width="600px"
+        :visible.sync="taskStatus"
+        v-if="taskStatus"
+      >
+        <taskinfo
+          :taskInfo="activeTask"
+          ref="taskinfo"
+          :rangeStart="rangeStart"
+          :rangeEnd="rangeEnd"
+          :MusicGroupList="MusicGroupList"
+          :itemId="itemId"
+          @refreshList="refreshList"
+        />
+        <div slot="footer" style="margin-top: 20px" class="dialog-footer">
+          <el-button @click="taskStatus = false">取 消</el-button>
+          <el-button type="primary" v-if="isNew" @click="submitInfo(0)"
+            >确 定</el-button
+          >
+          <el-button type="primary" v-else @click="submitInfo(1)"
+            >确 定</el-button
+          >
+        </div>
+      </el-dialog>
+      <taskList
+        style="margin-top: 15px"
+        ref="taskList"
+        @resetSchedule="resetSchedule"
+        @getTotal="getTotal"
       />
-      <div slot="footer" style="margin-top: 20px" class="dialog-footer">
-        <el-button @click="taskStatus = false">取 消</el-button>
-        <el-button type="primary" v-if="isNew" @click="submitInfo(0)"
-          >确 定</el-button
-        >
-        <el-button type="primary" v-else @click="submitInfo(1)"
-          >确 定</el-button
-        >
-      </div>
-    </el-dialog>
-    <taskList style="margin-top: 15px;" ref="taskList" @resetSchedule="resetSchedule" @getTotal='getTotal'/>
+    </div>
   </div>
 </template>
 <script>
@@ -94,7 +113,7 @@ import {
   getWeekDay,
 } from "@/utils/date";
 export default {
-  name:'scheduleDetail',
+  name: "scheduleDetail",
   components: {
     taskinfo,
     taskList,
@@ -119,21 +138,24 @@ export default {
       rangeEnd: "",
       organId: "",
       MusicGroupList: [],
-      times:'',
-      activeTotal:''
+      times: "",
+      activeTotal: "",
     };
   },
   async mounted() {
     this.init();
     // 获取乐团
     try {
-      const ruselt = await getMusicGroup({ organId: this.organId,userId:this.userId });
+      const ruselt = await getMusicGroup({
+        organId: this.organId,
+        userId: this.userId,
+      });
       this.MusicGroupList = ruselt.data;
     } catch (e) {}
   },
   methods: {
     init() {
-      this.times = this.$route.query.times
+      this.times = this.$route.query.times;
       this.itemId = this.$route.query.itemId;
       this.organId = this.$route.query.organId;
       this.rangeStart = this.$route.query.startTime;
@@ -168,13 +190,13 @@ export default {
           rows: 9999,
         });
         this.dataList = result.data.rows;
-         this.taskList = [];
+        this.taskList = [];
         for (let i in this.dataList) {
           this.setCourseTime(this.dataList[i]);
           this.taskList.push(this.dataList[i]);
         }
       } catch (e) {
-         (e);
+        e;
       }
     },
     setCourseTime(row) {
@@ -222,7 +244,7 @@ export default {
       this.$refs.taskList.getList();
     },
     onCancel() {
-        this.$store.dispatch('delVisitedViews', this.$route)
+      this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({
         path: "/workbench",
         query: { tabrouter: "teamSchedule" },
@@ -237,8 +259,7 @@ export default {
     dragOver(event) {
       event.preventDefault();
     },
-    dragstart(e){
-    },
+    dragstart(e) {},
     submitInfo(val) {
       // 新增修改提交
       this.$refs.taskinfo.submitInfo(val);
@@ -257,9 +278,9 @@ export default {
         this.taskStatus = true;
       }
     },
-    getTotal(val){
-      this.activeTotal = val
-    }
+    getTotal(val) {
+      this.activeTotal = val;
+    },
   },
 
   directives: {