Merge remote-tracking branch 'origin/develop' into develop

src/views/courselibrary/CoursewareManage.vue

@@ -70,13 +70,18 @@
                     </a-tree-select>
           </div>
           <div class="select fitems">
-            <a-range-picker
+
-              v-model:value="projectTime"
+            <div class="select addTimeBox">
-              style="width:420px;"
+              <div class="addTime">创建时间：</div>
-              valueFormat="X"
+              <a-range-picker
-              separator="至"
+                  v-model:value="projectTime"
-              :placeholder="['        开始时间（创建时间）', '        结束时间（创建时间）']"
+                  style="width:420px;"
-            />
+                  valueFormat="X"
+                  separator="至"
+                  :placeholder="['      开始时间', '        结束时间']"
+                />
+            </div>
+           
           </div>
         </div>
       </div>
@@ -5686,6 +5691,23 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
+.addTimeBox {
+  position: relative;
+  display: flex;
+  align-items: center;
+  .addTime {
+    position: absolute;
+    z-index: 10;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
+  .ant-picker {
+    padding-left: 85px;
+  }
+  .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px;
+  }
+}
 .aeLoading {
   z-index: 10000;
 }

src/views/examine/CourseReviewed.vue

@@ -243,7 +243,7 @@ export default {
                 style="color:#387DF7;cursor:pointer;"
                 onClick={() => {
                   console.log(value);
-                  showProjAuditModal(value.record.auditLogDtoList);
+                  showProjAuditModal(value.record.auditLogDtoList.length!==0?value.record.auditLogDtoList.slice(0,1):[]);
                 }}
               >
                 审核日志

src/views/examine/ProjectReviewed.vue

@@ -261,7 +261,7 @@ export default {
               <div>
                 <span
                   onClick={() => {
-                    showProjAuditModal(value.record.auditList);
+                    showProjAuditModal(value.record.auditList.length!==0?value.record.auditList.slice(value.record.auditList.length-1):[]);
                   }}
                   style="cursor:pointer;color:#387DF7"
                 >