项目签到时间

src/components/drawers/AddDiscuss.vue

@@ -41,6 +41,12 @@
           </div>
           <div class="main_item2">
             <div class="signbox">
+              <div class="sign">
+                <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                />
+              </div>
               <span style="margin-right: 3px">讨论说明：</span>
             </div>
             <div class="textarea">
@@ -91,6 +97,12 @@ const rulesRef = ref({
       message: '请输入讨论名称',
     },
   ],
+  discussExplain: [
+    {
+      required: true,
+      message: '请输入讨论说明',
+    },
+  ],
 });
 
 const {resetFields, validate} = Form.useForm(formData, rulesRef);

src/components/drawers/project/ProjectExternalExamManage.vue

@@ -296,7 +296,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.score?text.record.score:"-"}</span>
+                  <span> {text.record.score?text.record.score<0?"-":text.record.score:"-"} </span>
                 </div>
               );
             },

src/components/drawers/router/RouterExaminationExternalManage.vue

@@ -300,7 +300,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.score?text.record.score:"-"}</span>
+                  <span> {text.record.score?text.record.score<0?"-":text.record.score:"-"}</span>
                 </div>
               );
             },

src/views/courselibrary/CoursewareManage.vue

@@ -3747,7 +3747,12 @@ export default defineComponent({
       state.cstm_hs = true;
       state.kk_eidt = true;
     };
+<<<<<<< HEAD
     const columnFun = () => {
+=======
+    const columnFun = (itm) => {
+      console.log("itm", itm);
+>>>>>>> 2c0ee70d8d8b2d087356a3f9c9a352e1440cef1b
       //新加
       state.stuColumns = [
         {

src/views/projectcenter/LibraryAdd.vue

@@ -1114,7 +1114,7 @@ export default defineComponent({
       routered.push({
         path: "/templateAdd",
         query: {
-          projectTemplateId: state.projectInfo.projectTemplateId,
+          projectTemplateId: projectTemplateId,
         },
       });
     };

src/views/projectcenter/templateAdd.vue

@@ -4,10 +4,10 @@
     <div class="header">
       <span class="title">创建/编辑单层模板</span>
       <div
-          @click="backPage"
+        @click="backPage"
-          style="cursor: pointer"
+        style="cursor: pointer"
-          to="/libraryAdd"
+        to="/libraryAdd"
-          class="goback"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -31,18 +31,18 @@
             />
           </div>
         </div>
-        <div class="name" style="align-items: flex-start">
+        <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
             <img
-                class="nameimg"
+              class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
-          <div class="in select" style="display: flex">
+          <div class="in select" style="flex: 1; display: flex">
             <div
-                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-                style="
+              style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -50,23 +50,52 @@
                 position: relative;
                 overflow: hidden;
               "
-                v-for="(src, index) in projectPic"
+              v-for="(src, index) in projectPic"
-                :key="index"
+              :key="index"
-                @click="() => (projectInfo.picUrl = src.value)"
+              :style="{
+                display: index >= 3 ? 'none' : 'flex',
+              }"
+              @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                  style="
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                  :src="src.value"
+                :src="src.value"
-                  alt="avatar"
+                alt="avatar"
               />
             </div>
+            <div
+              @click="showLearnBgMore"
+              v-if="projectPic.length > 3"
+              style="
+                width: 100px;
+                height: 100px;
+                padding-left: 15px;
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                border: 1px solid #c7cbd2;
+                font-size: 14px;
+                font-weight: 400;
+                color: #4ea6ff;
+                line-height: 36px;
+              "
+            >
+              查看更多
+              <img src="../../assets/images/projectadd/go.png" alt="" />
+            </div>
           </div>
         </div>
+
+
         <div class="name">
           <div class="namebox">
             <img
@@ -242,7 +271,7 @@ const projectPic = ref([]);
 const courseSyncFlag = ref(true)
 onMounted(() => {
   getDetail();
-  projectPic.value = store.state.projectPic.map((e) => ({
+  projectPic.value = store.state.project_pic.map((e) => ({
     value: e.dictValue,
     label: e.dictName,
   }));
@@ -262,11 +291,15 @@ const getDetail = () =>
       projectInfo.value.rangeTime = [dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
         dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"),
       ];
-      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
+      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
+      console.log("查询到的模板库数据：" + JSON.stringify(projectInfo.value));
     });
 
 const backPage = () => {
-  router.back();
+  router.push({
+    path: "/libraryAdd",
+    query: { projectTemplateId : route.query.projectTemplateId}
+  });
 };
 
 function timeChange(e) {