Merge branch 'dongwu_develop' into develop

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.2.9------------");
+console.log("版本2.3.0------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/components/drawers/CheckAnsware.vue

@@ -21,7 +21,7 @@
                 <iframe
                     id="iframe"
                     style="width: 100%; height: 100%;"
-                    :src="iframeUrl + '/exam/viewanswer?id=' + answerId?answerId:datasource.answerId "
+                    :src="iframeUrl+'/exam/viewanswer?id='+(answerId?answerId:datasource.answerId)"
                     frameborder="0"
                     name="myframe"
                     security="restricted"

src/components/drawers/project/AddCertificate.vue

@@ -580,11 +580,10 @@ export default {
             state.selectTaskId = info.finishType == 3 ? info.finishValue : null;
             state.selectExamId = info.finishType == 4 ? info.finishValue : null;
             state.score = info.finishType == 5 ? info.finishValue : null; //积分
-
             let timer = setInterval(() => {
               if (
-                state.stageList.length !== 0 &&
-                state.taskList.length !== 0 &&
+                state.stageList.length !== 0 ||
+                state.taskList.length !== 0 ||
                 state.examList.length !== 0
               ) {
                 if (info.finishType == 2) {

src/components/student/TableCertificateStudent.vue

@@ -408,7 +408,7 @@ export default {
     justify-content: center;
     margin-left: 32px;
     cursor: pointer;
-    background: #388be1;
+    background: #4ea6ff;
     border-radius: 8px;
     font-size: 14px;
     font-weight: 400;

src/views/projectcenter/TaskPage.vue

@@ -350,7 +350,7 @@
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #a497ff">{{
-                      (projectInfoOverview.completeRatio || 0).toFixed(2)
+                      ((projectInfoOverview.completeRatio || 0) * 100).toFixed(2)
                   }}</span
                   ><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
@@ -897,6 +897,19 @@
                     </div>
                   </div>
                 </div>
+                <!-- 小组列表分页 -->
+                <div style="width: 100%;display:flex;justify-content:center;align-items:center;margin-top: 12px;">
+                  <a-pagination
+                    :showSizeChanger="false"
+                    showQuickJumper="true"
+                    hideOnSinglePage="true"
+                    :pageSize="stupageSize"
+                    :current="currentPageStu"
+                    :total="groupTotal"
+                    class="pagination"
+                    @change="changePagination"
+                  />
+                </div>
               </a-tab-pane>
             </a-tabs>
           </div>
@@ -2561,6 +2574,7 @@ export default {
       groupInfo: { leaderName: "", leaderId: "" }, //创建小组
       groupMemberCountContrast: null,
       groupPageList: [], //小组列表
+      groupTotal: 0,
       groupNumber: 0, //组员人数
       valuestun: "", //学员管理姓名
       valuegood: "",
@@ -4020,9 +4034,15 @@ export default {
       };
       getGroupList(objf).then((res) => {
         state.groupPageList = res.data.data.rows;
+        state.groupTotal = res.data.data.total;
         setGroupList(res.data.data.rows);
       });
     };
+    //分页
+    const changePagination = (page) => {
+      state.currentPageStu = page;
+      getGroup();
+    };
     //删除小组
     const deleteGroupBtn = (projectGroupId) => {
       deleteGroup({ projectGroupId }).then(() => {
@@ -5000,6 +5020,7 @@ export default {
       jdSelectChange1,
       studytimeRank,
       xsSelectChange,
+      changePagination
     };
   },
 };