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

src/views/examine/CourseReviewedN.vue

@@ -230,13 +230,14 @@
                   </div>
                 </div>
                 <div class="mbl_items">
-                  <div class="item_nam">
+                  <div v-if="(attachMap.length>0)" class="item_nam">
                     <span style="margin-right: 10px">附件</span>
                   </div>
                   <div class="item_inp" v-for="(value, index) in attachMap" :key="index">
-                    <a :src="value">
+                    <a>
                       {{ ['附件一', '附件二', '附件三', '附件四', '附件五', '附件六'][index] }}
                     </a>
+                    <a style="margin-left:120px;" :src="value" :href="value">查看</a>
                     <!-- <a-upload multiple :show-upload-list="false" :before-upload="beforeUpload2">
                       <div class="accessory" style="cursor: pointer">
                         <div class="accessory_icon">
@@ -287,9 +288,9 @@
               </div>
               <div class="fotarea">
                 <div style="border: 1px solid #ccc">
-                  <Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig"
+                  <!-- <Toolbar style="border-bottom: 1px solid #ccc;width:900px;height: 300px;"  :defaultConfig="toolbarConfig"
-                    :mode="mode" />
+                    :mode="mode" /> -->
-                  <Editor v-model="valueHtml" :defaultConfig="editorConfig" :mode="mode" @onCreated="handleCreated" />
+                  <Editor @focus="onEditorFocus" style="border-bottom: 1px solid #ccc;width:900px;height: 300px;"  v-model="valueHtml" :defaultConfig="editorConfig" :mode="mode" @onCreated="handleCreated" />
                 </div>
               </div>
             </div>
@@ -319,7 +320,7 @@ import { reactive, toRefs, onMounted, ref } from "vue";
 import { list, courseAuditView, courseDetail } from "../../api/indexAudit";
 import { toDate } from "../../api/method";
 import { message } from "ant-design-vue";
-import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
+import { Editor } from "@wangeditor/editor-for-vue";
 import { iframeUrl } from "../../api/method";
 import * as api1 from "@/api/index1";
 
@@ -327,7 +328,7 @@ export default {
   name: "CoursereViewedN",
   components: {
     Editor,
-    Toolbar,
+    // Toolbar,
   },
   setup() {
     const state = reactive({
@@ -505,7 +506,7 @@ export default {
           state.faceDetailObj = result;
           heroImg.value.src = result.picUrl
           valueHtml.value = result.outline
-          attachMap.value = result.attach.split(",")
+          attachMap.value = result.attach==""?[]:result.attach.split(",")
           console.log(result, attachMap.value);
         })
         .catch((err) => {
@@ -654,6 +655,11 @@ export default {
       //获取分类列表
       state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
     });
+
+    // 禁止用户编辑文本框内容
+    const onEditorFocus = (event) => {
+      event.enable(false);
+    }
     return {
       ...toRefs(state),
       getFaceList,
@@ -671,7 +677,8 @@ export default {
       valueHtml,
       attachMap,
       contentList11,
-      sceneist11
+      sceneist11,
+      onEditorFocus
     };
   },
 };

src/views/examine/ProjectReviewed.vue

@@ -188,6 +188,7 @@ export default {
           key: "topName",
           align: "center",
           width: "10%",
+          customRender: ({record: {parentId,name}}) => <div>{parentId==0?name:(parentId)}</div>,
         },
         {
           title: "项目经理",
@@ -219,6 +220,7 @@ export default {
           dataIndex: "description",
           key: "description",
           align: "center",
+          customRender: ({record: {auditList,description}}) => <div>{auditList.length!==0?auditList[auditList.length-1].description?auditList[auditList.length-1].description:'-':description?description:'-'}</div>,
         },
 
         {
@@ -290,6 +292,7 @@ export default {
         status: 1,
       };
       auditedlist(objn).then((res) => {
+        console.log('获取已审核项目列表数据',res)
         let result = res.data.data;
         state.total = res.data.data.total;
         state.tableData1 = result.rows
@@ -347,7 +350,7 @@ export default {
       reset,
       closeProjAuditModal,
       showProjAuditModal,
-      setAudit,
+      setAudit
     };
   },
 };

src/views/learningpath/LevelAdd.vue

@@ -460,7 +460,7 @@
                     </div>
                     <div class="time">
                       <div class="timetext">开始时间</div>
-                      <div class="timetext">{{ item.startTime!==null?item.startTime[0]+'-'+ item.startTime[1]+'-'+item.startTime[2]:''}}</div>
+                      <div class="timetext">{{ item.startTime!==null?item.startTime:''}}</div>
                     </div>
                     <div class="progress">
                       <div class="progresstext">

src/views/projectcenter/LibraryAdd.vue

@@ -15,7 +15,7 @@
         </div>
       </div>
       <div class="right">
-        <img class="img1" src="../../assets/images/leveladd/ma.png" />
+        <!-- <img class="img1" src="../../assets/images/leveladd/ma.png" />
         <div class="line"></div>
         <img class="img2" src="../../assets/images/projectadd/ending.png" />
         <div class="pub">结束项目</div>
@@ -33,7 +33,7 @@
             <div class="sammo">复制</div>
           </div>
         </div>
-        <div class="line"></div>
+        <div class="line"></div> -->
         <router-link to="/templatelibrary"
           ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />

src/views/projectcenter/TaskPage.vue

@@ -431,7 +431,7 @@
                       <div class="timetext">开始时间</div>
                       <div class="timetext">
                         {{
-                          item.startTime !== null ? item.startTime[0] + '-' + item.startTime[1] + '-' + item.startTime[2] : ''
+                          item.startTime !== null ? item.startTime: ''
                         }}
                       </div>
                     </div>

src/views/projectcenter/TemplateLibrary.vue

@@ -37,8 +37,23 @@
       </div>
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
-          <a-table :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false"
+          <a-table :columns="columns1" :data-source="tableData1"
-            expandRowByClick="true" @expand="expandTable" :pagination="pagination" />
+            expandRowByClick="true" @expand="expandTable" :pagination="false"/>
+            <div class="tableBox" style="display:flex;justify-content:center;padding:20px;">
+              <div class="pa">
+                <a-pagination
+                  v-if="tableDataTotal > 10"
+                  showSizeChanger="true"
+                  showQuickJumper="true"
+                  hideOnSinglePage="true"
+                  :pageSize="pageSize"
+                  v-model:current="currentPage"
+                  :total="tableDataTotal"
+                  class="pagination"
+                  @change="changePagination"
+                />
+              </div>
+            </div>
         </div>
       </div>
     </div>
@@ -73,13 +88,13 @@ const columns1 = [
     key: "creator",
     align: "center",
   },
-  {
+  // {
-    title: "最近学习时间",
+  //   title: "最近学习时间",
-    width: "25%",
+  //   width: "25%",
-    dataIndex: "stutime",
+  //   dataIndex: "stutime",
-    key: "stutime",
+  //   key: "stutime",
-    align: "center",
+  //   align: "center",
-  },
+  // },
   {
     title: "操作",
     width: "22%",
@@ -100,6 +115,7 @@ export default defineComponent({
       currentPage: 1,
       pageSize: 10,
       total:50,
+      tableDataTotal:0,
       tableData1: [
         {
           key: "1",
@@ -180,6 +196,12 @@ export default defineComponent({
       getLibraryList();
     })
 
+     // 翻页
+     const changePagination = (page) => {
+      pagination.current = page;
+      getLibraryList();
+    };
+
     // 获取模板列表
     const getLibraryList = () => {
       let date = Math.ceil(new Date(state.time).getTime() / 1000);
@@ -193,6 +215,7 @@ export default defineComponent({
       }
       api.templateList(obj).then((res) => {
         state.tableData1 = []
+        state.tableDataTotal = res.data.data.total;
         console.log(res);
         let resData = res.data.data.rows
         if (resData.length) {
@@ -253,6 +276,7 @@ export default defineComponent({
       resetLevel,
       pagination,
       toLibraryAdd,
+      changePagination
     };
   },
 });