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

src/components/NavLeft.vue

@@ -27,8 +27,15 @@
         @openChange="onOpenChange"
         @select="selectItem"
       >
-        <a-sub-menu v-if="checkMenu('coursereviewedn,coursereviewed,projectreviewedn,projectreviewed')" key="sub10"
+        <a-sub-menu
-                    @titleClick="titleClick">
+          v-if="
+            checkMenu(
+              'coursereviewedn,coursereviewed,projectreviewedn,projectreviewed'
+            )
+          "
+          key="sub10"
+          @titleClick="titleClick"
+        >
           <template #icon>
             <div class="imgBox">
               <img
@@ -94,7 +101,11 @@
           </a-menu-item>
         </a-sub-menu>
 
-        <a-menu-item key="sub1" @titleClick="titleClick" v-if="checkMenu('learningpath')">
+        <a-menu-item
+          key="sub1"
+          @titleClick="titleClick"
+          v-if="checkMenu('learningpath')"
+        >
           <div class="imgBox">
             <img
               style="width: 20px; height: 18px"
@@ -104,7 +115,11 @@
           <router-link to="/learningpath">学习路径图</router-link>
         </a-menu-item>
 
-        <a-sub-menu key="sub2" @titleClick="titleClick" v-if="checkMenu('projectmanage,templatelibrary')">
+        <a-sub-menu
+          key="sub2"
+          @titleClick="titleClick"
+          v-if="checkMenu('projectmanage,templatelibrary')"
+        >
           <template #icon>
             <div class="imgBox">
               <img
@@ -134,7 +149,10 @@
           </a-menu-item>
         </a-sub-menu>
 
-        <a-sub-menu key="sub3" v-if="checkMenu('coursewaremanage,onlinemanage,coursemanage')">
+        <a-sub-menu
+          key="sub3"
+          v-if="checkMenu('coursewaremanage,onlinemanage,coursemanage')"
+        >
           <template #icon>
             <div class="imgBox">
               <img
@@ -182,7 +200,11 @@
           </div>
           <span>考试中心</span>
         </a-menu-item> -->
-        <a-menu-item key="sub5" @titleClick="titleClick" v-if="checkMenu('researchmanage')">
+        <a-menu-item
+          key="sub5"
+          @titleClick="titleClick"
+          v-if="checkMenu('researchmanage')"
+        >
           <div class="imgBox">
             <img
               style="width: 16px; height: 16px"
@@ -192,7 +214,10 @@
           <router-link to="/researchmanage">评估管理</router-link>
         </a-menu-item>
 
-        <a-sub-menu key="sub6" v-if="checkMenu('OldSystemManage','ReadingClubManage','dictmanage')">
+        <!-- <a-sub-menu
+          key="sub6"
+          v-if="checkMenu('OldSystemManage', 'ReadingClubManage', 'dictmanage')"
+        >
           <template #icon>
             <div class="imgBox">
               <img
@@ -218,7 +243,9 @@
                 circle: selectedKeys[0] !== 'sub6-2',
               }"
             ></span>
-            <router-link to="/ReadingClubManage">业务支援读书会管理</router-link>
+            <router-link to="/ReadingClubManage"
+              >业务支援读书会管理</router-link
+            >
           </a-menu-item>
           <a-menu-item key="sub6-4" v-if="checkMenu('dictmanage')">
             <span
@@ -229,9 +256,9 @@
             ></span>
             <router-link to="/dictmanage">字典管理</router-link>
           </a-menu-item>
-        </a-sub-menu>
+        </a-sub-menu> -->
 
-        <a-sub-menu key="sub7"  v-if="checkMenu('AudienceManage')">
+        <!-- <a-sub-menu key="sub7"  v-if="checkMenu('AudienceManage')">
           <template #icon>
             <div class="imgBox">
               <img
@@ -250,8 +277,16 @@
             ></span>
             <router-link to="/AudienceManage">受众管理</router-link>
           </a-menu-item>
-        </a-sub-menu>
+        </a-sub-menu> -->
-
+        <a-menu-item key="sub7" v-if="checkMenu('AudienceManage')">
+          <div class="imgBox">
+            <img
+              style="width: 22px; height: 22px"
+              src="../assets/images/navleft/review.png"
+            />
+          </div>
+          <router-link to="/audiencemanage">受众管理</router-link>
+        </a-menu-item>
         <!-- <a-menu-item key="sub5" v-if="checkMenu('researchmanage')">
           <div class="imgBox">
             <img style="width: 16px; height: 16px" src="../assets/images/navleft/system.png"/>
@@ -299,8 +334,11 @@
         <!-- <router-link to="/systemmanage">系统管理</router-link> -->
         <!-- </a-menu-item> -->
 
-        <a-sub-menu key="sub11" @titleClick="titleClick"
+        <a-sub-menu
-                    v-if="checkMenu('questionmanage,papermanage,examinationcenter')">
+          key="sub11"
+          @titleClick="titleClick"
+          v-if="checkMenu('questionmanage,papermanage,examinationcenter')"
+        >
           <template #icon>
             <div class="imgBox">
               <img
@@ -309,7 +347,7 @@
               />
             </div>
           </template>
-          <template #title>考试</template>
+          <template #title>考试中心</template>
           <a-menu-item key="sub11-1" v-if="checkMenu('questionmanage')">
             <span
               :class="{
@@ -338,7 +376,11 @@
             <router-link to="/examinationcenter">考试管理</router-link>
           </a-menu-item>
         </a-sub-menu>
-        <a-menu-item key="sub12" @titleClick="titleClick" v-if="checkMenu('casemanage')">
+        <a-menu-item
+          key="sub12"
+          @titleClick="titleClick"
+          v-if="checkMenu('casemanage')"
+        >
           <div class="imgBox">
             <img
               style="width: 20px; height: 20px"
@@ -347,7 +389,11 @@
           </div>
           <router-link to="/casemanage">案例管理</router-link>
         </a-menu-item>
-        <a-menu-item key="sub13" @titleClick="titleClick" v-if="checkMenu('articlemanage')">
+        <a-menu-item
+          key="sub13"
+          @titleClick="titleClick"
+          v-if="checkMenu('articlemanage')"
+        >
           <div class="imgBox">
             <img
               style="width: 20px; height: 20px"
@@ -356,7 +402,11 @@
           </div>
           <router-link to="/articlemanage">文章管理</router-link>
         </a-menu-item>
-        <a-menu-item key="sub14" @titleClick="titleClick" v-if="checkMenu('qamanage')">
+        <a-menu-item
+          key="sub14"
+          @titleClick="titleClick"
+          v-if="checkMenu('qamanage')"
+        >
           <div class="imgBox">
             <img
               style="width: 20px; height: 20px"
@@ -365,7 +415,11 @@
           </div>
           <router-link to="/qamanage">问答管理</router-link>
         </a-menu-item>
-        <a-menu-item key="sub15" @titleClick="titleClick" v-if="checkMenu('download')">
+        <a-menu-item
+          key="sub15"
+          @titleClick="titleClick"
+          v-if="checkMenu('download')"
+        >
           <div class="imgBox">
             <img
               style="width: 20px; height: 20px"
@@ -374,6 +428,34 @@
           </div>
           <router-link to="/download">下载中心</router-link>
         </a-menu-item>
+
+        <a-menu-item key="sub16" v-if="checkMenu('OldSystemManage')">
+          <div class="imgBox">
+            <img
+              style="width: 22px; height: 22px"
+              src="../assets/images/navleft/review.png"
+            />
+          </div>
+          <router-link to="/oldsystemmanage">旧版管理员界面</router-link>
+        </a-menu-item>
+        <a-menu-item key="sub17" v-if="checkMenu('ReadingClubManage')">
+          <div class="imgBox">
+            <img
+              style="width: 22px; height: 22px"
+              src="../assets/images/navleft/review.png"
+            />
+          </div>
+          <router-link to="/readingclubmanage">业务支援读书会管理</router-link>
+        </a-menu-item>
+        <a-menu-item key="sub18" v-if="checkMenu('dictmanage')">
+          <div class="imgBox">
+            <img
+              style="width: 22px; height: 22px"
+              src="../assets/images/navleft/review.png"
+            />
+          </div>
+          <router-link to="/dictmanage">字典管理</router-link>
+        </a-menu-item>
       </a-menu>
     </div>
     <div
@@ -389,18 +471,34 @@
         mode="inline"
         @click="handleClick"
       >
-        <a-menu-item key="sub10" @titleClick="titleClick" v-if="checkMenu('coursereviewedn')">
+        <a-menu-item
+          key="sub10"
+          @titleClick="titleClick"
+          v-if="checkMenu('coursereviewedn')"
+        >
           <router-link to="/coursereviewedn">审核</router-link>
         </a-menu-item>
-        <a-menu-item key="sub1" @titleClick="titleClick" v-if="checkMenu('learningpath')">
+        <a-menu-item
+          key="sub1"
+          @titleClick="titleClick"
+          v-if="checkMenu('learningpath')"
+        >
           <router-link to="/learningpath">学习</router-link>
         </a-menu-item>
 
-        <a-menu-item key="sub2" @titleClick="titleClick" v-if="checkMenu('projectmanage')">
+        <a-menu-item
+          key="sub2"
+          @titleClick="titleClick"
+          v-if="checkMenu('projectmanage')"
+        >
           <router-link to="/projectmanage">项目</router-link>
         </a-menu-item>
 
-        <a-menu-item key="sub3" @titleClick="titleClick" v-if="checkMenu('coursewaremanage')">
+        <a-menu-item
+          key="sub3"
+          @titleClick="titleClick"
+          v-if="checkMenu('coursewaremanage')"
+        >
           <router-link to="/coursewaremanage">课程</router-link>
         </a-menu-item>
         <!-- 2022-12-10注释 后面放开 -->
@@ -408,9 +506,16 @@
           <span>考试</span>
         </a-menu-item> -->
 
-        <a-menu-item key="sub5" @titleClick="titleClick" v-if="checkMenu('researchmanage')">
+        <a-menu-item
+          key="sub5"
+          @titleClick="titleClick"
+          v-if="checkMenu('researchmanage')"
+        >
           <router-link to="/researchmanage">评估</router-link>
         </a-menu-item>
+        <a-menu-item key="sub7" v-if="checkMenu('AudienceManage')">
+          <router-link to="/audiencemanage">受众</router-link>
+        </a-menu-item>
         <!-- 2022-12-10注释 后面放开 -->
         <!-- <a-menu-item key="sub6" @titleClick="titleClick">
           <span>报表</span>
@@ -427,21 +532,51 @@
           <span>系统</span>
         </a-menu-item> -->
 
-        <a-menu-item key="sub11" @titleClick="titleClick" v-if="checkMenu('examinationcenter')">
+        <a-menu-item
+          key="sub11"
+          @titleClick="titleClick"
+          v-if="checkMenu('examinationcenter')"
+        >
           <router-link to="/examinationcenter">考试</router-link>
         </a-menu-item>
-        <a-menu-item key="sub12" @titleClick="titleClick" v-if="checkMenu('casemanage')">
+        <a-menu-item
+          key="sub12"
+          @titleClick="titleClick"
+          v-if="checkMenu('casemanage')"
+        >
           <router-link to="/casemanage">案例</router-link>
         </a-menu-item>
-        <a-menu-item key="sub13" @titleClick="titleClick" v-if="checkMenu('articlemanage')">
+        <a-menu-item
+          key="sub13"
+          @titleClick="titleClick"
+          v-if="checkMenu('articlemanage')"
+        >
           <router-link to="/articlemanage">文章</router-link>
         </a-menu-item>
-        <a-menu-item key="sub14" @titleClick="titleClick" v-if="checkMenu('qamanage')">
+        <a-menu-item
+          key="sub14"
+          @titleClick="titleClick"
+          v-if="checkMenu('qamanage')"
+        >
           <router-link to="/qamanage">问答</router-link>
         </a-menu-item>
-        <a-menu-item key="sub15" @titleClick="titleClick" v-if="checkMenu('download')">
+        <a-menu-item
+          key="sub15"
+          @titleClick="titleClick"
+          v-if="checkMenu('download')"
+        >
           <router-link to="/download">下载</router-link>
         </a-menu-item>
+
+        <a-menu-item key="sub16" v-if="checkMenu('OldSystemManage')">
+          <router-link to="/oldsystemmanage">旧版</router-link>
+        </a-menu-item>
+        <a-menu-item key="sub17" v-if="checkMenu('ReadingClubManage')">
+          <router-link to="/readingclubmanage">业务</router-link>
+        </a-menu-item>
+        <a-menu-item key="sub18" v-if="checkMenu('dictmanage')">
+          <router-link to="/dictmanage">字典</router-link>
+        </a-menu-item>
       </a-menu>
     </div>
   </div>
@@ -476,6 +611,9 @@ export default {
         "sub13",
         "sub14",
         "sub15",
+        "sub16",
+        "sub17",
+        "sub18",
       ],
       openKeys: localStorage.getItem("openKeys")
         ? JSON.parse(localStorage.getItem("openKeys"))
@@ -643,6 +781,30 @@ export default {
           selectedKeys: "sub15",
           pagename: "下载中心",
         },
+        {
+          href: "/audiencemanage",
+          openKeys: "sub7",
+          selectedKeys: "sub7",
+          pagename: "受众管理",
+        },
+        {
+          href: "/oldsystemmanage",
+          openKeys: "sub16",
+          selectedKeys: "sub16",
+          pagename: "旧版管理员界面",
+        },
+        {
+          href: "/readingclubmanage",
+          openKeys: "sub17",
+          selectedKeys: "sub17",
+          pagename: "业务支援读书会管理",
+        },
+        {
+          href: "/dictmanage",
+          openKeys: "sub18",
+          selectedKeys: "sub18",
+          pagename: "字典管理",
+        },
       ],
     });
 

src/views/projectcenter/TaskPage.vue

@@ -3090,10 +3090,13 @@ export default {
       state.isEdit = isEdit;
       state.stugroup = true;
       state.groupInfo = item || {};
+      if (isEdit) {
         state.groupMemberCountContrast = item.groupMemberCount;
+      }
     };
     const closeModal2 = () => {
       state.stugroup = false;
+      state.buttonLoading = false
       state.groupInfo = {};
       state.groupMemberCountContrast = null;
       getGroup();