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

src/components/NavLeft.vue

@@ -1,39 +1,46 @@
 <template>
   <div
-      class="navLeft"
+    class="navLeft"
-      :style="{
+    :style="{
       width: packup ? '100px' : '208px',
       'min-height': screenHeight - 80 + 'px',
     }"
   >
     <div style="display: flex; justify-content: flex-end">
       <img
-          class="packup"
+        class="packup"
-          src="../assets/images/navleft/packup.png"
+        src="../assets/images/navleft/packup.png"
-          @click="packUp"
+        @click="packUp"
-          :style="{ 'margin-right': packup ? '36px' : '14px' }"
+        :style="{ 'margin-right': packup ? '36px' : '14px' }"
       />
     </div>
     <div
-        style="width: 100%; margin-top: 26px"
+      style="width: 100%; margin-top: 26px"
-        :style="{ display: packup ? 'none' : 'block' }"
+      :style="{ display: packup ? 'none' : 'block' }"
     >
       <a-menu
-          id="dddddd"
+        id="dddddd"
-          :open-keys="openKeys"
+        :open-keys="openKeys"
-          :selectedKeys="selectedKeys"
+        :selectedKeys="selectedKeys"
-          style="width: 208px"
+        style="width: 208px"
-          mode="inline"
+        mode="inline"
-          @openChange="onOpenChange"
+        @openChange="onOpenChange"
-          @select="selectItem"
+        @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
-                  style="width: 22px; height: 22px"
+                style="width: 22px; height: 22px"
-                  src="../assets/images/navleft/review.png"
+                src="../assets/images/navleft/review.png"
               />
             </div>
           </template>
@@ -42,7 +49,7 @@
             <span
               :class="{
                 circleActive: selectedKeys[0] === 'sub10-5',
-                circle: selectedKeys[0]!=='sub10-5',
+                circle: selectedKeys[0] !== 'sub10-5',
               }"
             ></span>
             <router-link to="/TobeOnlineReviewed">待审核在线课</router-link>
@@ -51,14 +58,14 @@
             <span
               :class="{
                 circleActive: selectedKeys[0] === 'sub10-6',
-                circle: selectedKeys[0]!=='sub10-6',
+                circle: selectedKeys[0] !== 'sub10-6',
               }"
             ></span>
             <router-link to="/OnlineReviewed">已审核在线课</router-link>
           </a-menu-item>
           <a-menu-item key="sub10-1" v-if="checkMenu('coursereviewedn')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub10-1' ? true : false,
                 circle: selectedKeys[0] === 'sub10-1' ? false : true,
               }"
@@ -67,7 +74,7 @@
           </a-menu-item>
           <a-menu-item key="sub10-2" v-if="checkMenu('coursereviewed')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub10-2' ? true : false,
                 circle: selectedKeys[0] === 'sub10-2' ? false : true,
               }"
@@ -76,7 +83,7 @@
           </a-menu-item>
           <a-menu-item key="sub10-3" v-if="checkMenu('projectreviewedn')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub10-3' ? true : false,
                 circle: selectedKeys[0] === 'sub10-3' ? false : true,
               }"
@@ -85,7 +92,7 @@
           </a-menu-item>
           <a-menu-item key="sub10-4" v-if="checkMenu('projectreviewed')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub10-4' ? true : false,
                 circle: selectedKeys[0] === 'sub10-4' ? false : true,
               }"
@@ -94,29 +101,37 @@
           </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"
+              style="width: 20px; height: 18px"
-                src="../assets/images/navleft/studyPath.png"
+              src="../assets/images/navleft/studyPath.png"
             />
           </div>
           <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
-                  style="width: 15px; height: 15px"
+                style="width: 15px; height: 15px"
-                  src="../assets/images/navleft/project.png"
+                src="../assets/images/navleft/project.png"
               />
             </div>
           </template>
           <template #title>项目中心</template>
           <a-menu-item key="sub2-1" v-if="checkMenu('projectmanage')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub2-1' ? true : false,
                 circle: selectedKeys[0] === 'sub2-1' ? false : true,
               }"
@@ -125,7 +140,7 @@
           </a-menu-item>
           <a-menu-item key="sub2-2" v-if="checkMenu('templatelibrary')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub2-2' ? true : false,
                 circle: selectedKeys[0] === 'sub2-2' ? false : true,
               }"
@@ -134,19 +149,22 @@
           </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
-                  style="width: 18px; height: 15px"
+                style="width: 18px; height: 15px"
-                  src="../assets/images/navleft/course.png"
+                src="../assets/images/navleft/course.png"
               />
             </div>
           </template>
           <template #title>课程库</template>
           <a-menu-item key="sub3-1" v-if="checkMenu('coursewaremanage')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub3-1' ? true : false,
                 circle: selectedKeys[0] === 'sub3-1' ? false : true,
               }"
@@ -155,7 +173,7 @@
           </a-menu-item>
           <a-menu-item key="sub3-2" v-if="checkMenu('onlinemanage')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub3-2' ? true : false,
                 circle: selectedKeys[0] === 'sub3-2' ? false : true,
               }"
@@ -164,7 +182,7 @@
           </a-menu-item>
           <a-menu-item key="sub3-3" v-if="checkMenu('coursemanage')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub3-3' ? true : false,
                 circle: selectedKeys[0] === 'sub3-3' ? false : true,
               }"
@@ -182,56 +200,65 @@
           </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"
+              style="width: 16px; height: 16px"
-                src="../assets/images/navleft/survey.png"
+              src="../assets/images/navleft/survey.png"
             />
           </div>
           <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
-                  style="width: 22px; height: 22px"
+                style="width: 22px; height: 22px"
-                  src="../assets/images/navleft/review.png"
+                src="../assets/images/navleft/review.png"
               />
             </div>
           </template>
           <template #title>系统管理</template>
           <a-menu-item key="sub6-1" v-if="checkMenu('OldSystemManage')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub6-1',
-                circle: selectedKeys[0]!=='sub6-1',
+                circle: selectedKeys[0] !== 'sub6-1',
               }"
             ></span>
             <router-link to="/OldSystemManage">旧版管理员界面</router-link>
           </a-menu-item>
           <a-menu-item key="sub6-2" v-if="checkMenu('ReadingClubManage')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub6-2',
-                circle: selectedKeys[0]!=='sub6-2',
+                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
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub6-4',
-                circle: selectedKeys[0]!=='sub6-4',
+                circle: selectedKeys[0] !== 'sub6-4',
               }"
             ></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,20 +334,23 @@
         <!-- <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
-                  style="width: 16px; height: 16px"
+                style="width: 16px; height: 16px"
-                  src="../assets/images/navleft/test.png"
+                src="../assets/images/navleft/test.png"
               />
             </div>
           </template>
-          <template #title>考试</template>
+          <template #title>考试中心</template>
           <a-menu-item key="sub11-1" v-if="checkMenu('questionmanage')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub11-1' ? true : false,
                 circle: selectedKeys[0] === 'sub11-1' ? false : true,
               }"
@@ -321,7 +359,7 @@
           </a-menu-item>
           <a-menu-item key="sub11-2" v-if="checkMenu('papermanage')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub11-2' ? true : false,
                 circle: selectedKeys[0] === 'sub11-2' ? false : true,
               }"
@@ -330,7 +368,7 @@
           </a-menu-item>
           <a-menu-item key="sub11-3" v-if="checkMenu('examinationcenter')">
             <span
-                :class="{
+              :class="{
                 circleActive: selectedKeys[0] === 'sub11-3' ? true : false,
                 circle: selectedKeys[0] === 'sub11-3' ? false : true,
               }"
@@ -338,69 +376,129 @@
             <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"
+              style="width: 20px; height: 20px"
-                src="../assets/images/navleft/case.png"
+              src="../assets/images/navleft/case.png"
             />
           </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"
+              style="width: 20px; height: 20px"
-                src="../assets/images/navleft/article.png"
+              src="../assets/images/navleft/article.png"
             />
           </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"
+              style="width: 20px; height: 20px"
-                src="../assets/images/navleft/qa.png"
+              src="../assets/images/navleft/qa.png"
             />
           </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"
+              style="width: 20px; height: 20px"
-                src="../assets/images/navleft/qa.png"
+              src="../assets/images/navleft/qa.png"
             />
           </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
-        style="width: 100%; margin-top: 26px"
+      style="width: 100%; margin-top: 26px"
-        :style="{ display: packup ? 'block' : 'none' }"
+      :style="{ display: packup ? 'block' : 'none' }"
-        class="packupMenu"
+      class="packupMenu"
     >
       <a-menu
-          id="dddddd"
+        id="dddddd"
-          v-model:openKeys="openKeys2"
+        v-model:openKeys="openKeys2"
-          v-model:selectedKeys="selectedKeys2"
+        v-model:selectedKeys="selectedKeys2"
-          style="width: 100px"
+        style="width: 100px"
-          mode="inline"
+        mode="inline"
-          @click="handleClick"
+        @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,31 +532,61 @@
           <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>
 </template>
 
 <script>
-import {reactive, toRefs, onMounted, onUnmounted, watch} from "vue";
+import { reactive, toRefs, onMounted, onUnmounted, watch } from "vue";
-import {useRoute} from "vue-router";
+import { useRoute } from "vue-router";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
-import {checkMenu} from "@/utils/utils";
+import { checkMenu } from "@/utils/utils";
 
 export default {
   name: "NavLeft",
@@ -476,19 +611,22 @@ export default {
         "sub13",
         "sub14",
         "sub15",
+        "sub16",
+        "sub17",
+        "sub18",
       ],
       openKeys: localStorage.getItem("openKeys")
-          ? JSON.parse(localStorage.getItem("openKeys"))
+        ? JSON.parse(localStorage.getItem("openKeys"))
-          : ["sub1"], //默认打开以及打开的一级导航
+        : ["sub1"], //默认打开以及打开的一级导航
       selectedKeys: localStorage.getItem("selectedKeys")
-          ? JSON.parse(localStorage.getItem("selectedKeys"))
+        ? JSON.parse(localStorage.getItem("selectedKeys"))
-          : ["sub1"], //默认选择以及选择的二级导航
+        : ["sub1"], //默认选择以及选择的二级导航
       openKeys2: localStorage.getItem("openKeys")
-          ? JSON.parse(localStorage.getItem("openKeys"))
+        ? JSON.parse(localStorage.getItem("openKeys"))
-          : ["sub1"], //默认打开以及打开的一级导航
+        : ["sub1"], //默认打开以及打开的一级导航
       selectedKeys2: localStorage.getItem("openKeys")
-          ? JSON.parse(localStorage.getItem("openKeys"))
+        ? JSON.parse(localStorage.getItem("openKeys"))
-          : ["sub1"], //默认选择以及选择的二级导航
+        : ["sub1"], //默认选择以及选择的二级导航
 
       keysList: [
         {
@@ -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: "字典管理",
+        },
       ],
     });
 
@@ -650,7 +812,7 @@ export default {
 
     const onOpenChange = (openKeys) => {
       const latestOpenKey = openKeys.find(
-          (key) => state.openKeys.indexOf(key) === -1
+        (key) => state.openKeys.indexOf(key) === -1
       );
       if (state.rootSubmenuKeys.indexOf(latestOpenKey) === -1) {
         state.openKeys = openKeys;
@@ -665,8 +827,8 @@ export default {
         if (e.key === value.selectedKeys) {
           localStorage.setItem("openKeys", JSON.stringify([value.openKeys]));
           localStorage.setItem(
-              "selectedKeys",
+            "selectedKeys",
-              JSON.stringify([value.selectedKeys])
+            JSON.stringify([value.selectedKeys])
           );
           state.openKeys = [value.openKeys];
           state.selectedKeys = [value.selectedKeys];
@@ -678,70 +840,70 @@ export default {
 
     const route = useRoute();
     watch(
-        () => route.fullPath,
+      () => route.fullPath,
-        (n) => {
+      (n) => {
-          console.log("监听路由", n, store.state.openpages, state.keysList);
+        console.log("监听路由", n, store.state.openpages, state.keysList);
-          // console.log("new:" + n.toLowerCase() + ",old:" + o);
+        // console.log("new:" + n.toLowerCase() + ",old:" + o);
-          let arr = state.keysList;
+        let arr = state.keysList;
-          arr.map((value) => {
+        arr.map((value) => {
-            if (n.toLowerCase() === value.href) {
+          if (n.toLowerCase() === value.href) {
-              localStorage.setItem("openKeys", JSON.stringify([value.openKeys]));
+            localStorage.setItem("openKeys", JSON.stringify([value.openKeys]));
-              localStorage.setItem(
+            localStorage.setItem(
-                  "selectedKeys",
+              "selectedKeys",
-                  JSON.stringify([value.selectedKeys])
+              JSON.stringify([value.selectedKeys])
-              );
+            );
-              state.openKeys = [value.openKeys];
+            state.openKeys = [value.openKeys];
-              state.selectedKeys = [value.selectedKeys];
+            state.selectedKeys = [value.selectedKeys];
-              state.openKeys2 = [value.openKeys];
+            state.openKeys2 = [value.openKeys];
-              state.selectedKeys2 = [value.openKeys];
+            state.selectedKeys2 = [value.openKeys];
-            }
+          }
+        });
+        let openpages = store.state.openpages;
+        if (openpages.length === 0) {
+          let pagename = state.keysList.filter((a) => {
+            return a.href === n.toLowerCase();
           });
-          let openpages = store.state.openpages;
+          if (pagename && pagename.length !== 0) {
-          if (openpages.length === 0) {
+            let obj = {
-            let pagename = state.keysList.filter((a) => {
+              pagename: pagename[0].pagename,
-              return a.href === n.toLowerCase();
+              href: n.toLowerCase(),
-            });
+              active: true,
-            if (pagename && pagename.length !== 0) {
+            };
-              let obj = {
+            openpages.push(obj);
-                pagename: pagename[0].pagename,
+          }
-                href: n.toLowerCase(),
+        } else {
-                active: true,
+          for (let i = 0; i < openpages.length; i++) {
-              };
+            openpages[i].active = false;
-              openpages.push(obj);
+          }
-            }
+          for (let i = 0; i < openpages.length; i++) {
-          } else {
+            openpages[i].active = false;
-            for (let i = 0; i < openpages.length; i++) {
+            if (n.toLowerCase() === openpages[i].href) {
-              openpages[i].active = false;
+              console.log("已存在", openpages[i]);
-            }
+              openpages[i].active = true;
-            for (let i = 0; i < openpages.length; i++) {
+              break;
-              openpages[i].active = false;
+            } else {
-              if (n.toLowerCase() === openpages[i].href) {
+              if (i === openpages.length - 1) {
-                console.log("已存在", openpages[i]);
+                let pagename = state.keysList.filter((a) => {
-                openpages[i].active = true;
+                  return a.href === n.toLowerCase();
-                break;
+                });
-              } else {
+                if (pagename && pagename.length !== 0) {
-                if (i === openpages.length - 1) {
+                  let obj = {
-                  let pagename = state.keysList.filter((a) => {
+                    pagename: pagename[0].pagename,
-                    return a.href === n.toLowerCase();
+                    href: n.toLowerCase(),
-                  });
+                    active: true,
-                  if (pagename && pagename.length !== 0) {
+                  };
-                    let obj = {
+                  openpages.push(obj);
-                      pagename: pagename[0].pagename,
-                      href: n.toLowerCase(),
-                      active: true,
-                    };
-                    openpages.push(obj);
-                  }
                 }
               }
             }
           }
-
-          localStorage.setItem("openpages", JSON.stringify(openpages));
-          store.commit("chengeOpenpages", openpages);
-
-          // store.getters.chengeOpenpages(openpages)
         }
+
+        localStorage.setItem("openpages", JSON.stringify(openpages));
+        store.commit("chengeOpenpages", openpages);
+
+        // store.getters.chengeOpenpages(openpages)
+      }
     );
     const packUp = () => {
       state.packup = !state.packup;

src/views/projectcenter/TaskPage.vue

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