xw 2 days ago
parent
commit
5217b235e5

+ 3 - 3
src/views/course/courseWatchLog/index.vue

@@ -326,7 +326,7 @@
           >批量移除标签</el-button>
         </el-col>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5"  v-if="queryParams.sendType == 2">
         <el-button
           type="success"
           plain
@@ -337,7 +337,7 @@
         >批量修改备注
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="queryParams.sendType == 2">
         <el-button
           type="success"
           plain
@@ -549,7 +549,7 @@
                 @click="tagSelection(tagItem)"
                 :class="{ 'tag-selected': tagItem.isSelected }"
               >
-                {{ tagItem.name }}
+                {{ tagItem.name }} {{ tagItem.corpName }}
               </a>
             </div>
           </div>

+ 4 - 4
src/views/course/courseWatchLog/watchLog.vue

@@ -291,7 +291,7 @@
           >批量移除标签</el-button>
         </el-col>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="queryParams.sendType == 2">
         <el-button
           type="success"
           plain
@@ -302,7 +302,7 @@
         >批量修改备注
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="queryParams.sendType == 2">
         <el-button
           type="success"
           plain
@@ -540,7 +540,7 @@
                 @click="tagSelection(tagItem)"
                 :class="{ 'tag-selected': tagItem.isSelected }"
               >
-                {{ tagItem.name }}
+                {{ tagItem.name }}{{ tagItem.corpName }}
               </a>
             </div>
           </div>
@@ -887,7 +887,7 @@ export default {
   methods: {
     setToday(){
       const today = new Date();
-      const todayStart = new Date(today);
+      const todayStart = new Date(today-60*60*24*7*1000);
       todayStart.setHours(0, 0, 0, 0);
       const todayEnd = new Date(today);
       todayEnd.setHours(23, 59, 59, 999);