eoss-ui 0.7.68 → 0.7.70

package/packages/main/src/simplicityTop/index.vue

@@ -42,7 +42,7 @@
             <div slot="reference" class="es-simplicity-pannel-user">
               <!-- <avatar :user="user" :size="56" :show-name="true"></avatar> -->
               <div class="es-simplicitytop-greeting">
-                {{ user.username }}，{{ greeting }}
+                {{ user.username || '-' }}，{{ greeting }}
               </div>
               <!-- <div class="es-simplicity-username"></div> -->
             </div>
@@ -60,25 +60,27 @@
             </span>
           </div>
           <div class="es-simplicitytop-menu-children">
-            <div
-              class="es-simplicitytop-menu-children-item"
-              v-for="(child, i) in myRemind"
-              :key="i"
-              @click="handleSelect(child)"
-            >
-              <div class="es-simplicitytop-menu-children-icon">
-                <i :class="child.icon"></i>
-              </div>
-              <div class="es-simplicitytop-menu-children-name">
-                {{ child.text || child.name }}
-              </div>
+            <template v-for="(child, i) in myRemind">
               <div
-                class="es-simplicitytop-menu-children-badge"
-                v-if="child.badge && child.num"
+                class="es-simplicitytop-menu-children-item"
+                v-if="child.hasPermission"
+                :key="i"
+                @click="handleSelect(child)"
               >
-                {{ child.num }}
+                <div class="es-simplicitytop-menu-children-icon">
+                  <i :class="child.icon"></i>
+                </div>
+                <div class="es-simplicitytop-menu-children-name">
+                  {{ child.text || child.name }}
+                </div>
+                <div
+                  class="es-simplicitytop-menu-children-badge"
+                  v-if="child.badge && child.num"
+                >
+                  {{ child.num }}
+                </div>
               </div>
-            </div>
+            </template>
           </div>
         </div>
         <div
@@ -93,8 +95,9 @@
               <div
                 class="es-simplicitytop-menu-children-item"
                 v-for="(child, i) in userCommonMenuList"
+                v-if="child.hasPermission"
                 :key="i"
-                @click="handleSelect(child, 'wujie')"
+                @click="handleSelect(child)"
               >
                 <div class="es-simplicitytop-menu-children-icon">
                   <i
@@ -120,7 +123,23 @@
             @select="(res) => handleSelect(res)"
           ></es-menu>
         </div>
-
+        <div
+          class="es-simplicitytop-main-fourth-tabs"
+          v-if="currentPage.appCode && currentPage.appCode !== 'indexUrl'"
+        >
+          <el-tabs
+            ref="fourthTab"
+            v-model="tabActiveName"
+            @tab-click="fourthTabClick"
+          >
+            <el-tab-pane
+              :label="item.text"
+              v-for="(item, index) in fourthTabs"
+              :key="index"
+              :name="item.id"
+            ></el-tab-pane>
+          </el-tabs>
+        </div>
         <div class="es-simplicitytop-main-router">
           <router-page
             v-if="currentPage.method === 'router'"
@@ -244,285 +263,6 @@
         <!-- AI/IM end -->
       </div>
     </div>
-
-    <div class="es-simplicity-side" v-if="false">
-      <img class="es-simplicity-logo" v-if="mainLogo" :src="mainLogo" />
-      <div
-        class="es-simplicity-org-name es-text-ellipsis-row4"
-        :title="simpleUserInfo.orgShortName || simpleUserInfo.orgName"
-      >
-        {{ simpleUserInfo.orgShortName || simpleUserInfo.orgName }}
-      </div>
-      <el-dropdown
-        v-if="user.identityList && user.identityList.length > 1"
-        trigger="click"
-        placement="bottom-start"
-        @command="handleDepSelect"
-      >
-        <div class="es-simplicity-dep-post">
-          <span class="es-simplicity-dep-name"> {{ user.depName }}</span>
-          <template v-if="user.postName">
-            |
-            <span class="es-simplicity-post-name">{{
-              user.position || user.postName
-            }}</span>
-          </template>
-          <i class="es-icon-qiehuangangwei"></i>
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            v-for="item in user.identityList"
-            :key="item.id"
-            :command="item"
-            :class="{ 'is-active': user.identityId == item.id }"
-            >{{ item.name }}</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-popover
-        class="es-simplicity-user-popover"
-        placement="right-start"
-        width="360"
-        trigger="click"
-      >
-        <!-- 用户信息 -->
-        <user
-          ref="user"
-          :user="user"
-          :notifyList="notifyList"
-          :notify="notify"
-          :contents="userInfoContents"
-          @success="handleSuccess"
-          @change="handleChangeConfig"
-          @close="handlerClose"
-        ></user>
-        <div slot="reference" class="es-simplicity-pannel-user">
-          <avatar
-            v-show="showAvatar"
-            :user="user"
-            :size="56"
-            :show-name="true"
-          ></avatar>
-          <div class="es-simplicity-greeting" v-show="!showAvatar">
-            {{ greeting }}
-          </div>
-          <div class="es-simplicity-username">{{ user.username }}</div>
-        </div>
-        <!-- 用户信息 end -->
-      </el-popover>
-      <div class="es-simplicity-side-Application">
-        <!-- 常用应用 -->
-        <el-scrollbar>
-          <div
-            class="es-simplicity-side-app"
-            v-for="item in userApps"
-            :class="{ 'is-active': active == item.id }"
-            :key="item.id"
-            :title="item.text || item.name"
-            @click="handlerClickApp(item)"
-          >
-            <el-badge
-              class="es-simplicity-side-app-badge"
-              v-bind="getBadge(item)"
-            >
-              <es-icon
-                class="es-simplicity-side-app-icon"
-                :contents="item.icons || item.icon || menuIcon"
-              ></es-icon>
-              <div class="es-simplicity-side-app-text">
-                {{ item.text || item.name }}
-              </div>
-            </el-badge>
-          </div>
-          <div
-            class="es-simplicity-side-app"
-            @click="handlerClickApp()"
-            v-show="applications.length"
-          >
-            <es-icon
-              class="es-simplicity-side-app-icon"
-              contents="es-icon-more"
-            ></es-icon>
-            <div class="es-simplicity-side-app-text">更多</div>
-          </div>
-          <div
-            class="es-simplicity-side-app"
-            v-for="(item, index) in newApps"
-            :class="{ 'is-active': active == item.id }"
-            :key="item.id"
-            :title="item.text || item.name"
-            @click.stop="handlerClickApp(item)"
-          >
-            <i
-              class="el-icon-circle-close"
-              @click.stop="handleDelete(index)"
-            ></i>
-            <el-badge v-bind="getBadge(item)">
-              <es-icon
-                class="es-simplicity-side-app-icon"
-                :contents="item.icons || item.icon || menuIcon"
-              ></es-icon>
-              <div class="es-simplicity-side-app-text">
-                {{ item.text || item.name }}
-              </div>
-            </el-badge>
-          </div>
-        </el-scrollbar>
-        <!-- 常用应用 end -->
-      </div>
-      <div class="es-simplicity-side-app" v-if="_aiConfig && showAi">
-        <img
-          :src="_aiConfig.icon"
-          class="es-simplicity-ai-icon"
-          @click="handlerSetDrawer(_aiConfig, 'ai')"
-        />
-      </div>
-    </div>
-    <div class="es-simplicity-main" v-if="false">
-      <!-- 路由、iframe -->
-      <div class="es-simplicity-tabs-handler-mask" v-show="showTabsHandler">
-        <el-card class="es-simplicity-tabs-handler" ref="tabsHandler">
-          <div
-            class="es-simplicity-tabs-handler-item"
-            :class="{ 'is-disabled': isDisabled.refresh }"
-            @click="isDisabled.refresh ? '' : handleTabsEvents(0)"
-          >
-            刷新
-          </div>
-          <div
-            class="es-simplicity-tabs-handler-item"
-            @click="handleTabsEvents(1)"
-          >
-            关闭标签
-          </div>
-          <div
-            class="es-simplicity-tabs-handler-item"
-            :class="{ 'is-disabled': isDisabled.other }"
-            @click="isDisabled.other ? '' : handleTabsEvents(2)"
-          >
-            关闭其他
-          </div>
-          <div
-            class="es-simplicity-tabs-handler-item"
-            :class="{ 'is-disabled': isDisabled.left }"
-            @click="isDisabled.left ? '' : handleTabsEvents(3)"
-          >
-            关闭左侧
-          </div>
-          <div
-            class="es-simplicity-tabs-handler-item"
-            :class="{ 'is-disabled': isDisabled.right }"
-            @click="isDisabled.right ? '' : handleTabsEvents(4)"
-          >
-            关闭右侧
-          </div>
-        </el-card>
-      </div>
-      <el-tabs
-        class="es-simplicity-iframe"
-        :class="{ 'is-open': showMenu, 'is-fold': fold }"
-        v-model="activeName"
-        closable
-        hide-bar
-        opacity
-        @tab-click="handleTabClick"
-        @tab-remove="handleRemove"
-        @tab-contextmenu="handleContextmenu"
-      >
-        <!-- 操作栏 -->
-        <!-- <handler
-          slot="append"
-          v-bind="handleConfig"
-          :show-title-type="showTitleType"
-          :data="_handleDatas"
-          :nums="handleNums"
-          @click="handleClick"
-        ></handler> -->
-        <!-- 操作栏 end-->
-
-        <!-- 菜单 -->
-        <sub-menu
-          v-if="subMenus"
-          :collapse="isCollapse"
-          :mode="mode"
-          :visible.sync="showMenu"
-          :closed.sync="fold"
-          :size="menuWidth"
-          :title="title"
-          :color="menuColor"
-          :backgroundColor="menuBackgroundColor"
-          :menu-icon="menuIcon"
-          :active="subActive"
-          v-bind="subMenus"
-          @command="handlerClickMenu"
-        ></sub-menu>
-        <!-- 菜单 end -->
-        <el-tab-pane
-          v-for="item in tabs"
-          :key="item.id"
-          :label="item.text || item.name"
-          :name="item.id"
-        >
-          <router-page
-            v-if="item.method === 'router'"
-            v-bind="item"
-            :query="$parent.params"
-          ></router-page>
-          <iframe
-            v-else-if="isIE || item.method == 'iframe'"
-            v-loading="item.loading"
-            frameborder="0"
-            width="100%"
-            height="100%"
-            :id="activeName == item.id ? iframeId : item.id || item.appCode"
-            :name="activeName == item.id ? iframeId : item.id || item.appCode"
-            :onload="handleLoadIframe(item)"
-            :src="item.url"
-          ></iframe>
-          <es-wujie
-            v-else-if="item.method === 'wujie' && item.url"
-            :host="host"
-            :show="true"
-            :props="wjProps"
-            :attrs="wjAttrs"
-            :name="item.appCode"
-            :url="item.url"
-          ></es-wujie>
-        </el-tab-pane>
-      </el-tabs>
-      <!-- 路由、iframe end -->
-
-      <!-- 消息提醒 -->
-      <notice :data="sysMsg" :winopen="winopen" @opened="handleOpened"></notice>
-      <!-- 消息提醒 end -->
-
-      <es-dialog
-        class="es-public-search-dialog"
-        :visible.sync="showSearch"
-        size="lg"
-      >
-        <search
-          :apps="applications"
-          :menus="menus"
-          :menuIcon="menuIcon"
-          @select="handleSelect"
-        ></search>
-      </es-dialog>
-      <!-- 公用弹窗 -->
-      <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
-        <template v-if="dialog.title == '查看在线人员' && !dialog.src">
-          <online></online>
-        </template>
-        <iframe
-          v-else-if="dialog.show"
-          width="100%"
-          height="100%"
-          frameborder="0"
-          :src="dialog.src"
-        ></iframe>
-      </es-dialog>
-      <!-- 公用弹窗 end -->
-    </div>
     <!-- 设置 -->
     <settings
       v-bind="$attrs"
@@ -535,6 +275,20 @@
       @layout="handleLayout"
     ></settings>
     <!-- 设置 end-->
+    <!-- 公用弹窗 -->
+    <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
+      <template v-if="dialog.title == '查看在线人员' && !dialog.src">
+        <online></online>
+      </template>
+      <iframe
+        v-else-if="dialog.show"
+        width="100%"
+        height="100%"
+        frameborder="0"
+        :src="dialog.src"
+      ></iframe>
+    </es-dialog>
+    <!-- 公用弹窗 end -->
   </div>
 </template>
 
@@ -629,7 +383,7 @@ export default {
     return {
       esMain: this,
       refresh: this.handleRefresh,
-      jumpMenu: this.jumpMenu
+      jumpMenu: this.jumpTopMenu
     };
   },
   components: {
@@ -824,210 +578,7 @@ export default {
       }
     },
     icons: Object,
-    myRemind: {
-      type: Array,
-      default: () => {
-        return [
-          {
-            badge: true,
-            icon: 'es-icon-solid-shijian',
-            id: '589cdcff17f44a58bccb5b44de0e90c5',
-            text: '待办事项',
-            icons: '',
-            url: '/bpm/wfPending/wfPending/makeList.dhtml',
-            target: 'stage',
-            sort: 1,
-            remindurl:
-              'http://boot-gateway:8080/bpm/wfPending/wfPending/getMakeNum.dhtml',
-            pid: 'd92e4c724cc74b13a4119f644eff0be8',
-            level: 3,
-            quickicons: '',
-            appType: '0',
-            urlopenmode: 0,
-            hasPermission: false,
-            appId: '',
-            extendData: {
-              businessStatus: 1,
-              businessWarnMsg: ''
-            },
-            fourthTabs: [],
-            children: [],
-            method: 'iframe',
-            loading: false,
-            num: 0
-          },
-          {
-            badge: false,
-            icon: 'es-icon-solid-yiban',
-            id: '259600a64a6840a4952251fe0a7bd890',
-            text: '已办事项',
-            icons: '',
-            url: '/bpm/wfpened/wfPended/list.dhtml?viewName=yibing',
-            target: 'stage',
-            sort: 3,
-            remindurl: '',
-            pid: 'd92e4c724cc74b13a4119f644eff0be8',
-            level: 3,
-            quickicons: '',
-            appType: '0',
-            appCode: 'yibingwdyb',
-            urlopenmode: 0,
-            hasPermission: false,
-            appId: '',
-            fourthTabs: [],
-            children: [],
-            method: 'iframe',
-            loading: false,
-            num: 0
-          },
-          {
-            text: '待签公文',
-            badge: true,
-            num: 0,
-            icon: 'es-icon-solid-daiqiangongwen',
-            id: '03158b72e0d644f6ae97e55ee598a17d',
-            url: '/archives-ui/webpack/index.html#/sign/signList',
-            remindurl: '',
-            pid: 'ec4a6e89b1b346a4a2e8f4245e315da3',
-            appCode: 'signList',
-            appId: 'q291a124fc151se5b4b890191c65e485',
-            fourthTabs: [],
-            children: [],
-            method: 'wujie'
-          },
-          {
-            badge: true,
-            icon: 'es-icon-juqiangongwen',
-            id: 'bbc03189766441e6a46550c556d61f03',
-            text: '拒签公文',
-            icons: '',
-            url: '/archives-ui/webpack/index.html#/dispatch/rejectedList',
-            target: 'stage',
-            sort: 4,
-            remindurl: '',
-            pid: '7fd13c86f596417b95d2b7622906f70f',
-            level: 3,
-            quickicons: '',
-            appType: '0',
-            appCode: 'rejectedList',
-            urlopenmode: 0,
-            hasPermission: false,
-            appId: 'q291a124fc151se5b4b890191c65e485',
-            extendData: {
-              businessStatus: 1,
-              businessWarnMsg: ''
-            },
-            fourthTabs: [],
-            children: [],
-            method: 'wujie'
-          },
-          {
-            badge: true,
-            num: 0,
-            icon: 'es-icon-solid-ziliao',
-            routerName: '',
-            id: 'df9d1baedf6a4107bfa9f5d763a98fc0',
-            text: '待收资料',
-            icons: '',
-            url: '/oa/sharefiles/receive/list.dhtml',
-            target: 'stage',
-            sort: 0,
-            remindurl: '',
-            pid: 'd648a3e7ae16458a823fdbe911e4d76e',
-            level: 2,
-            quickicons: '',
-            appType: '1',
-            appCode: 'sharefilesReceive',
-            urlopenmode: 0,
-            hasPermission: false,
-            appId: 'q291a124fc151se5b4b890191c65e485',
-            extendData: {
-              businessStatus: 1,
-              businessWarnMsg: ''
-            },
-            fourthTabs: [],
-            children: [],
-            method: 'iframe',
-            loading: false
-          },
-          {
-            text: '待签会议',
-            badge: true,
-            num: 0,
-            icon: 'es-icon-solid-huiyileixing',
-            id: '407eff212ecd4355ad1fb28c8de6e882',
-            icons: '',
-            url: '/conference/meetingReceive/receive_list.dhtml?meetState=-5',
-            target: 'stage',
-            sort: 0,
-            remindurl: '',
-            pid: 'bc1b01feafc64ae68beed2da5559ff7c',
-            level: 3,
-            quickicons: '',
-            appType: '0',
-            appCode: 'hyqs',
-            urlopenmode: 0,
-            hasPermission: false,
-            appId: '',
-            extendData: {
-              businessStatus: 1,
-              businessWarnMsg: ''
-            },
-            fourthTabs: [
-              {
-                id: 'c2d3fb3c7d684b06b4511233a6b5f03b',
-                text: '未签收',
-                icons: '',
-                url: '/conference/meetingReceive/receive_list.dhtml?meetState=-5',
-                target: 'stage',
-                sort: 1,
-                remindurl: '',
-                pid: '407eff212ecd4355ad1fb28c8de6e882',
-                level: 4,
-                quickicons: '',
-                appType: '0',
-                appCode: 'wqsmeeting',
-                urlopenmode: 0,
-                hasPermission: false,
-                appId: '',
-                extendData: {
-                  businessStatus: 1,
-                  businessWarnMsg: ''
-                },
-                fourthTabs: [],
-                children: []
-              },
-              {
-                id: '9990c8064694403ba5ee85f098738aab',
-                text: '已签收',
-                icons: '',
-                url: '/conference/meetingReceive/receive_list.dhtml?meetState=-6',
-                target: 'stage',
-                sort: 2,
-                remindurl: '',
-                pid: '407eff212ecd4355ad1fb28c8de6e882',
-                level: 4,
-                quickicons: '',
-                appType: '0',
-                appCode: 'yqs',
-                urlopenmode: 0,
-                hasPermission: false,
-                appId: '',
-                extendData: {
-                  businessStatus: 1,
-                  businessWarnMsg: ''
-                },
-                fourthTabs: [],
-                children: []
-              }
-            ],
-            children: [],
-            method: 'iframe',
-            loading: false
-          }
-        ];
-      }
-    },
+
     userCommonMenu: {
       type: String,
       default: queryUseCommonMenu
@@ -1035,6 +586,7 @@ export default {
   },
   data() {
     return {
+      tabActiveName: '',
       currentPage: {
         method: ''
       },
@@ -1047,9 +599,10 @@ export default {
           systemurl: null,
           icons: '',
           sort: 4,
-          menuCode: 'dispatch_org',
+          appCode: 'dispatch_org',
           urlopenmode: 0,
-          defaultMenu: 1
+          defaultMenu: 1,
+          pid: 'cc529d06f2fe4c9aa5956e7f540b8cd2'
         },
         {
           id: '00c9e4e6e9974a789dbf2d99620c1773',
@@ -1059,9 +612,10 @@ export default {
           systemurl: null,
           icons: '',
           sort: 5,
-          menuCode: 'sharefilesSend',
+          appCode: 'sharefilesSend',
           urlopenmode: 0,
-          defaultMenu: 1
+          defaultMenu: 1,
+          pid: 'd648a3e7ae16458a823fdbe911e4d76e'
         },
         {
           id: '7588320f81dd49d09fd8832037b1c57a',
@@ -1071,9 +625,10 @@ export default {
           systemurl: null,
           icons: '',
           sort: 1,
-          menuCode: 'receiptAdd',
+          appCode: 'receiptAdd',
           urlopenmode: 0,
-          defaultMenu: 0
+          defaultMenu: 0,
+          pid: 'ec4a6e89b1b346a4a2e8f4245e315da3'
         }
       ],
       //是否显示头像
@@ -1196,7 +751,209 @@ export default {
       //展示系统操作按钮标题类型
       showTitleType: this.showHandlerTitleType,
       layout: this.scene.toLowerCase(),
-      reladding: false
+      reladding: false,
+      fourthTabs: [],
+      jumpMenu: this.handleSelect,
+      myRemind: [
+        {
+          badge: true,
+          icon: 'es-icon-solid-shijian',
+          id: '589cdcff17f44a58bccb5b44de0e90c5',
+          text: '待办事项',
+          icons: '',
+          url: '/bpm/wfPending/wfPending/makeList.dhtml',
+          target: 'stage',
+          sort: 1,
+          remindurl:
+            'http://boot-gateway:8080/bpm/wfPending/wfPending/getMakeNum.dhtml',
+          pid: 'd92e4c724cc74b13a4119f644eff0be8',
+          level: 3,
+          quickicons: '',
+          appType: '0',
+          appCode: 'pengding_make1',
+          urlopenmode: 0,
+          hasPermission: false,
+          appId: '',
+          extendData: {
+            businessStatus: 1,
+            businessWarnMsg: ''
+          },
+          fourthTabs: [],
+          children: [],
+          method: 'iframe',
+          loading: false,
+          num: 0
+        },
+        {
+          badge: false,
+          icon: 'es-icon-solid-yiban',
+          id: '259600a64a6840a4952251fe0a7bd890',
+          text: '已办事项',
+          icons: '',
+          url: '/bpm/wfpened/wfPended/list.dhtml?viewName=yibing',
+          target: 'stage',
+          sort: 3,
+          remindurl: '',
+          pid: 'd92e4c724cc74b13a4119f644eff0be8',
+          level: 3,
+          quickicons: '',
+          appType: '0',
+          appCode: 'yibingwdyb',
+          urlopenmode: 0,
+          hasPermission: false,
+          appId: '',
+          fourthTabs: [],
+          children: [],
+          method: 'iframe',
+          loading: false,
+          num: 0
+        },
+        {
+          text: '待签公文',
+          badge: true,
+          num: 0,
+          icon: 'es-icon-solid-daiqiangongwen',
+          id: '03158b72e0d644f6ae97e55ee598a17d',
+          url: '/archives-ui/webpack/index.html#/sign/signList',
+          remindurl: '',
+          pid: 'ec4a6e89b1b346a4a2e8f4245e315da3',
+          appCode: 'signList',
+          appId: 'q291a124fc151se5b4b890191c65e485',
+          fourthTabs: [],
+          children: [],
+          method: 'wujie'
+        },
+        {
+          badge: true,
+          icon: 'es-icon-juqiangongwen',
+          id: 'bbc03189766441e6a46550c556d61f03',
+          text: '拒签公文',
+          icons: '',
+          url: '/archives-ui/webpack/index.html#/dispatch/rejectedList',
+          target: 'stage',
+          sort: 4,
+          remindurl: '',
+          pid: '7fd13c86f596417b95d2b7622906f70f',
+          level: 3,
+          quickicons: '',
+          appType: '0',
+          appCode: 'rejectedList',
+          urlopenmode: 0,
+          hasPermission: false,
+          appId: 'q291a124fc151se5b4b890191c65e485',
+          extendData: {
+            businessStatus: 1,
+            businessWarnMsg: ''
+          },
+          fourthTabs: [],
+          children: [],
+          method: 'wujie'
+        },
+        {
+          badge: true,
+          num: 0,
+          icon: 'es-icon-solid-ziliao',
+          routerName: '',
+          id: 'df9d1baedf6a4107bfa9f5d763a98fc0',
+          text: '待收资料',
+          icons: '',
+          url: '/oa/sharefiles/receive/list.dhtml',
+          target: 'stage',
+          sort: 0,
+          remindurl: '',
+          pid: 'd648a3e7ae16458a823fdbe911e4d76e',
+          level: 2,
+          quickicons: '',
+          appType: '1',
+          appCode: 'sharefilesReceive',
+          urlopenmode: 0,
+          hasPermission: false,
+          appId: 'q291a124fc151se5b4b890191c65e485',
+          extendData: {
+            businessStatus: 1,
+            businessWarnMsg: ''
+          },
+          fourthTabs: [],
+          children: [],
+          method: 'iframe',
+          loading: false
+        },
+        {
+          text: '待签会议',
+          badge: true,
+          num: 0,
+          icon: 'es-icon-solid-huiyileixing',
+          id: '407eff212ecd4355ad1fb28c8de6e882',
+          icons: '',
+          url: '/conference/meetingReceive/receive_list.dhtml?meetState=-5',
+          target: 'stage',
+          sort: 0,
+          remindurl: '',
+          pid: 'bc1b01feafc64ae68beed2da5559ff7c',
+          level: 3,
+          quickicons: '',
+          appType: '0',
+          appCode: 'hyqs',
+          urlopenmode: 0,
+          hasPermission: false,
+          appId: '',
+          extendData: {
+            businessStatus: 1,
+            businessWarnMsg: ''
+          },
+          fourthTabs: [
+            {
+              id: 'c2d3fb3c7d684b06b4511233a6b5f03b',
+              text: '未签收',
+              icons: '',
+              url: '/conference/meetingReceive/receive_list.dhtml?meetState=-5',
+              target: 'stage',
+              sort: 1,
+              remindurl: '',
+              pid: '407eff212ecd4355ad1fb28c8de6e882',
+              level: 4,
+              quickicons: '',
+              appType: '0',
+              appCode: 'wqsmeeting',
+              urlopenmode: 0,
+              hasPermission: false,
+              appId: '',
+              extendData: {
+                businessStatus: 1,
+                businessWarnMsg: ''
+              },
+              fourthTabs: [],
+              children: []
+            },
+            {
+              id: '9990c8064694403ba5ee85f098738aab',
+              text: '已签收',
+              icons: '',
+              url: '/conference/meetingReceive/receive_list.dhtml?meetState=-6',
+              target: 'stage',
+              sort: 2,
+              remindurl: '',
+              pid: '407eff212ecd4355ad1fb28c8de6e882',
+              level: 4,
+              quickicons: '',
+              appType: '0',
+              appCode: 'yqs',
+              urlopenmode: 0,
+              hasPermission: false,
+              appId: '',
+              extendData: {
+                businessStatus: 1,
+                businessWarnMsg: ''
+              },
+              fourthTabs: [],
+              children: []
+            }
+          ],
+          children: [],
+          method: 'iframe',
+          loading: false
+        }
+      ]
     };
   },
   computed: {
@@ -1299,11 +1056,25 @@ export default {
     this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
-    this.handleListener();
+    // this.handleListener();
     this.getNums();
-    window.top.jumpTopMenu = this.handleSelect;
+    window.top.jumpMenu = window.top.jumpTopMenu = this.handleSelect;
   },
   methods: {
+    // tab点击事件
+    fourthTabClick(res) {
+      const index = res.index;
+      this.currentPage = {
+        appCode: this.fourthTabs[index]
+      };
+      console.log(this.currentPage, 'this.currentPage');
+
+      // console.log(this.fourthTabs[index], 'this.fourthTabs[index]');
+      // 增加阻塞 重载页面
+      setTimeout(() => {
+        this.currentPage = this.setIframeType(this.fourthTabs[index]);
+      }, 0);
+    },
     //获取数量
     getNums() {
       this.getIndexCount();
@@ -1334,7 +1105,6 @@ export default {
         .then((res) => {
           if (res.rCode === 0) {
             this.myRemind[5].num = res.results > 99 ? '99+' : res.results;
-            console.log('查询会议数量', res.results);
           }
         });
     },
@@ -1476,6 +1246,7 @@ export default {
       this.setConfig(results);
       if (this.remote && first) {
         this.getApplications();
+        // 此处的快捷 是用户自定义的 不是系统配置的快捷菜单 所以注释掉
         // this.getUseCommonMenu();
       }
     },
@@ -1740,13 +1511,6 @@ export default {
      * @date 2024年9月7日
      **/
     getMenus(loading) {
-      const menuData = store.get('nav');
-
-      if (menuData && menuData.length) {
-        loading.close();
-        this.renderMenus(menuData);
-        return;
-      }
       util
         .ajax({ url: this._menuUrl })
         .then((res) => {
@@ -1777,109 +1541,87 @@ export default {
      * @date 2024年9月7日
      **/
     renderMenus(res) {
-      this.menus = res;
-      this.setTips(this.menus);
-      store.set('nav', this.menus);
-      if (this.indexUrl) {
-        let obj = this.getMenu(this.menus, this.indexUrl);
-        obj = obj
-          ? JSON.parse(JSON.stringify(obj))
-          : {
-              url: this.indexUrl,
-              text: this.indexTitle,
-              id: '0',
-              appCode: 'indexUrl'
+      // console.log(res, 'renderMenus');
+      // 此主题样式的情况下 只显示二级菜单  三级菜单以tab的形式加载   如果没有三级菜单 1.不需要展示tab,2.tab为二级菜单
+      const rebuildMenu = res.map((level1Menu) => {
+        const transformedLevel1 = {
+          ...level1Menu,
+          children: level1Menu.children.map((level2Menu) => {
+            const transformedLevel2 = {
+              ...level2Menu,
+              // 处理三级菜单
+              fourthTabs:
+                level2Menu.children && level2Menu.children.length > 0
+                  ? level2Menu.children.map((level3Menu) => ({
+                      ...level3Menu
+                    }))
+                  : [
+                      {
+                        // 如果没有三级菜单，将二级菜单自身作为三级菜单
+                        ...level2Menu
+                      }
+                    ]
             };
-        this.homePage = this.setIframeType(obj);
-        this.currentPage = this.homePage;
-        // console.log(this.currentPage, 'currentPagecurrentPage');
 
-        if (!this.appCode) {
-          this.tabs = [this.homePage];
-          this.activeName = this.homePage.id;
-        }
-      }
-      if (this.appCode) {
-        let code = this.sysCode || this.appCode;
-        let app = this.userApps.filter((item) => {
-          return item.code === code;
-        })[0];
-        if (app) {
-          this.active = app.id;
-          if (app.url) {
-            let obj = this.getMenu(this.menus, app.url);
-            if (obj) {
-              obj = JSON.parse(JSON.stringify(obj));
-              let tab = this.setIframeType(obj);
-              this.tabs = [tab];
-              this.activeName = tab.id;
-            } else {
-              this.tabs = [app];
-            }
-          }
-        }
-        if (this.sysCode) {
-          let subMenus = this.getMenu(this.menus, this.sysCode, 'appCode');
-          if (subMenus) {
-            let obj = this.getMenu(this.menus, this.appCode, 'appCode');
-            if (obj) {
-              if (obj.url) {
-                obj = JSON.parse(JSON.stringify(obj));
-              } else {
-                obj = JSON.parse(JSON.stringify(this.getFirst(obj)));
-              }
-              this.subActive = obj.id;
-              let tab = this.setIframeType(obj);
-              this.tabs = [tab];
-              this.activeName = tab.id;
-            } else {
-              this.subActive = '';
-            }
-            this.subMenus = subMenus;
-            this.showMenu =
-              (subMenus.children && subMenus.children.length > 0) ||
-              (subMenus.fourthTabs && subMenus.fourthTabs.length > 0);
-          } else {
-            this.subMenus = null;
-            this.showMenu = false;
-            this.$message.error('未分配菜单权限，请联系管理员！');
-          }
-        } else {
-          let subMenus = this.getMenu(this.menus, this.appCode, 'appCode');
-          if (subMenus) {
-            if (this.tabs.length == 0) {
-              let obj = this.getFirst(subMenus);
-              if (obj) {
-                obj = JSON.parse(JSON.stringify(obj));
-                this.subActive = obj.id;
-                let tab = this.setIframeType(obj);
-                this.tabs = [tab];
-                this.activeName = tab.id;
-              } else {
-                this.subActive = '';
-              }
-            }
-            this.subMenus = subMenus;
-            this.showMenu =
-              (subMenus.children && subMenus.children.length > 0) ||
-              (subMenus.fourthTabs && subMenus.fourthTabs.length > 0);
-          } else {
-            this.subMenus = null;
-            this.showMenu = false;
-            this.$message.error('未分配菜单权限，请联系管理员！');
+            // 清除children，避免渲染问题
+            transformedLevel2.children = [];
+
+            return transformedLevel2;
+          })
+        };
+
+        return transformedLevel1;
+      });
+
+      // 判断myRemind中每个项是否在菜单列表中，并设置hasPermission
+      this.updateRemindPermission(res);
+
+      // console.log('rebuildMenu', rebuildMenu);
+
+      this.menus = rebuildMenu;
+      this.setTips(this.menus);
+      store.set('nav', this.menus);
+      let obj = this.getMenu(this.menus, this.indexUrl);
+      obj = obj
+        ? JSON.parse(JSON.stringify(obj))
+        : {
+            url: this.indexUrl,
+            text: this.indexTitle,
+            id: '0',
+            appCode: 'indexUrl'
+          };
+      this.homePage = this.setIframeType(obj);
+      this.currentPage = this.homePage;
+      // console.log(this.currentPage, 'currentPage');
+    },
+    /**
+     * 更新myRemind中各项的权限状态
+     * @param {Array} menus - 完整的菜单列表
+     */
+    updateRemindPermission(menus) {
+      // 创建一个Set存储所有菜单的id，方便快速查找
+      const menuIdSet = new Set();
+      // 递归遍历菜单列表，收集所有id
+      const collectMenuIds = (menuList) => {
+        menuList.forEach((menu) => {
+          menuIdSet.add(menu.id);
+          if (menu.children && menu.children.length > 0) {
+            collectMenuIds(menu.children);
           }
-        }
-      } else if (this.initApps && this.initApps.length && !this.indexUrl) {
-        let obj = this.getMenu(
-          this.menus,
-          this.initApps[this.initApps.length - 1]
-        );
-        if (obj) {
-          let tab = this.setIframeType(JSON.parse(JSON.stringify(obj)));
-          this.tabs.push(tab);
-          this.activeName = tab.id;
-        }
-      }
+        });
+      };
+      // 收集所有菜单id
+      collectMenuIds(menus);
+      // 更新myRemind中各项的hasPermission
+      this.myRemind.forEach((remind) => {
+        // 判断remind.id是否存在于菜单id集合中
+        remind.hasPermission = menuIdSet.has(remind.id);
+      });
+      // 同时更新userCommonMenuList中各项的hasPermission
+      this.userCommonMenuList.forEach((item) => {
+        // 判断item.id是否存在于菜单id集合中
+        item.hasPermission = menuIdSet.has(item.id);
+      });
     },
     /**
      * @desc:设置页面加载类型
@@ -2314,60 +2056,6 @@ export default {
     handleCloseDrawer() {
       this.drawer = { visible: false };
     },
-    /**
-     * @desc:菜单点击
-     * @author huangbo
-     * @date 2024年9月7日
-     **/
-    handlerClickMenu(res) {
-      util
-        .ajax({
-          url: recordUserApp,
-          params: {
-            userId: this.user.userId,
-            appId: res.id
-          }
-        })
-        .then(() => {})
-        .catch(() => {});
-      this.showMsg = false;
-      this.showSet = false;
-
-      if (res.url) {
-        if (res.urlopenmode == 1 || res.openModel == 1) {
-          util.win.open(res.url);
-          return;
-        } else if (res.urlopenmode == 2 || res.openModel == 2) {
-          util.win.open(res.url, '_self');
-          return;
-        }
-      }
-      let i = util.indexOfObj(this.tabs, res, 'id');
-      if (i == -1) {
-        let tab = this.setIframeType(res);
-        this.tabs.push(tab);
-        this.activeName = res.id;
-      } else {
-        this.tabs = events[0](this.tabs, i, this);
-        // let tab = this.tabs[i];
-        // if (tab.method === 'iframe') {
-        //   this.activeName = res.id;
-        //   this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
-        // } else {
-        //   if (tab.method === 'wujie' && tab.appCode) {
-        //     window.document
-        //       .querySelector(`iframe[name=${tab.appCode}]`)
-        //       .contentWindow.location.reload(true);
-        //   }
-        //   if (tab.method === 'router') {
-        //     this.$set(this.tabs[i], 'keys', util.uuid());
-        //   }
-        //   this.activeName = res.id;
-        // }
-        this.activeName = res.id;
-      }
-    },
-
     /**
      * @desc:用户详情请求成功
      * @author huangbo
@@ -2416,6 +2104,7 @@ export default {
      * @date 2024年9月7日
      **/
     handleRefresh(arg) {
+      this.getNums();
       let i =
         arg && arg != true && arg !== 'pageData'
           ? util.indexOfObj(this.tabs, arg, 'appCode,code,id,url')
@@ -2783,113 +2472,133 @@ export default {
         clearTimeout(this.sysMsgOut);
       }
     },
-    jumpMenu(res, close, params = {}) {
-      let apps = res;
-      let param = params;
-      let reload = true;
-      if (typeof res === 'string') {
-        apps = res.split(',');
-      } else if (util.isObject(res)) {
-        apps = Array.isArray(res.appCode)
-          ? res.appCode
-          : res.appCode.split(',');
-        res.param && (param = { ...res.param, ...params });
-        reload = Object.prototype.hasOwnProperty.call(res, 'reload')
-          ? res.reload
-          : true;
-      }
-      let obj = this.getMenu(this.menus, apps[apps.length - 1]);
-      if (obj) {
-        obj = JSON.parse(JSON.stringify(obj));
-        let i = util.indexOfObj(this.tabs, obj, 'id,code,appCode');
-        let n = util.indexOfObj(this.tabs, this.activeName, 'id');
-        let old = this.activeName;
-        this.activeName = obj.id;
-        if (i == -1) {
-          let tab = this.setIframeType(obj);
-          this.$set(tab, 'url', util.handlerUrl(tab.url, param));
-          this.tabs.splice(n + 1, 0, tab);
-        } else {
-          let tab = this.tabs[i];
-          if (tab.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url, param));
-          }
-          if (tab.method === 'wujie' && tab.appCode) {
-            const url = param ? util.handlerUrl(tab.url, param) : tab.url;
-            if (reload || param) {
-              tab.url = '';
-              this.$nextTick(() => {
-                tab.url = url;
-              });
-            }
-            // if (param) {
-            //   window.document.querySelector(
-            //     `iframe[name=${tab.appCode}]`
-            //   ).contentWindow.location.href = util.handlerUrl(tab.url, param);
-            // } else {
-            //   window.document
-            //     .querySelector(`iframe[name=${tab.appCode}]`)
-            //     .contentWindow.location.reload(true);
-            // }
-          }
-          if (tab.method === 'router') {
-            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url, param));
-            this.$set(this.tabs[i], 'keys', util.uuid());
-          }
+    /**
+     * @desc:菜单点击事件
+     * @author huangbo
+     * @date 2024年9月7日
+     * @param {*} res 菜单点击事件参数
+     * @param {*} method 菜单点击事件方法
+     * 1.顶部菜单点击跳转已经实现
+     * 2.其他地方点击跳转,需要选中跳转的一二级菜单
+     **/
+    handleSelect(res, params = {}) {
+      console.log(res, 'handleSelect');
+
+      if (res.urlopenmode == 1 || res.openModel == 1) {
+        util.win.open(res.url || res.menuurl);
+      } else if (res.urlopenmode == 2 || res.openModel == 2) {
+        util.win.open(res.url || res.menuurl, '_self');
+      } else {
+        const node = res.node ? res.node : res;
+
+        let apps = node;
+        let param = params;
+        let reload = true;
+        if (typeof res === 'string') {
+          apps = res.split(',');
+        } else if (util.isObject(node)) {
+          const appCode = node.appCode || node.menuCode;
+          apps = Array.isArray(appCode) ? appCode : appCode.split(',');
+          node.param && (param = { ...node.param, ...params });
+          reload = Object.prototype.hasOwnProperty.call(node, 'reload')
+            ? node.reload
+            : true;
         }
-        if (close) {
-          if (close === old) {
-            this.tabs.splice(n, 1);
+
+        const { currentPage, fourthTabs } = this.findMenuById(
+          apps[apps.length - 1]
+        );
+        if (currentPage) {
+          this.currentPage = {};
+          this.fourthTabs = [];
+          if (currentPage.fourthTabs && currentPage.fourthTabs.length > 0) {
+            this.fourthTabs = currentPage.fourthTabs;
+            this.currentPage = this.setIframeType(this.fourthTabs[0]);
+            if (param) {
+              this.currentPage.url = util.handlerUrl(
+                this.currentPage.url,
+                param
+              );
+            }
+            this.tabActiveName = this.currentPage.id;
           } else {
-            let d = util.indexOfObj(this.tabs, close, 'id,code,appCode');
-            if (d > -1) {
-              this.tabs.splice(d, 1);
+            this.fourthTabs = fourthTabs;
+            this.currentPage = this.setIframeType(currentPage);
+            if (param) {
+              this.currentPage.url = util.handlerUrl(
+                this.currentPage.url,
+                param
+              );
             }
+            this.tabActiveName = this.currentPage.id;
           }
+        } else {
+          this.$alert('没有关联菜单，请联系管理员！', '提示', {
+            confirmButtonText: '确定',
+            type: 'warning'
+          }).catch(() => {});
         }
-      } else {
-        this.$message.error('没有此菜单！');
       }
     },
-    //监听改变菜单
-    handleListener() {
-      util.win.addEventListener(
-        'message',
-        (e) => {
-          var msg = e.data;
-          if (msg.key == 'jump_Menu') {
-            let res = msg.data1;
-            this.jumpMenu(res);
+    findMenuById(res) {
+      let targetMenu = null;
+      let siblingMenus = [];
+      let transformedMenus = this.menus;
+      // 递归查找函数
+      function searchMenu(menuList) {
+        for (let menu of menuList) {
+          // 检查是否为一级菜单
+          if (menu.url === res || menu.id === res || menu.appCode === res) {
+            targetMenu = { ...menu, level: 1 };
+            siblingMenus = transformedMenus;
+            return true;
           }
-        },
-        false
-      );
-    },
-    handleSelect(res, method) {
-      console.log(res, 'resss');
 
-      if (method) {
-        if (res.urlopenmode == 0) {
-          this.currentPage = {
-            url: res.menuurl,
-            method: 'wujie',
-            ...res
-          };
-        } else {
-          util.win.open(res.menuurl);
+          // 检查是否为二级菜单
+          if (menu.children) {
+            for (let level2Menu of menu.children) {
+              if (
+                level2Menu.url === res ||
+                level2Menu.id === res ||
+                level2Menu.appCode === res
+              ) {
+                targetMenu = {
+                  ...level2Menu,
+                  level: 2
+                };
+                siblingMenus = menu.children;
+                return true;
+              }
+
+              // 检查是否为三级菜单（在fourthTabs中）
+              if (level2Menu.fourthTabs) {
+                const foundInTabs = level2Menu.fourthTabs.find(
+                  (tab) =>
+                    tab.id === res || tab.appCode === res || tab.url == res
+                );
+                if (foundInTabs) {
+                  targetMenu = {
+                    ...foundInTabs,
+                    level: 3,
+                    parentId: level2Menu.id
+                  };
+                  siblingMenus = level2Menu.fourthTabs;
+                  return true;
+                }
+              }
+            }
+          }
         }
-      } else {
-        this.currentPage = this.setIframeType(res.node ? res.node : res);
+        return false;
       }
-      // console.log(this.currentPage, 'this.currentPage');
 
-      // this.showSearch = false;
-      // if (parent.name === '应用') {
-      //   this.handlerClickApps(res);
-      // }
-      // if (parent.name === '菜单') {
-      //   this.handlerClickApp(res);
-      // }
+      // 开始查找
+      searchMenu(this.menus);
+
+      return {
+        currentPage: targetMenu,
+        fourthTabs: siblingMenus // 不需要过滤自身
+      };
     },
     handleLoadIframe(item) {
       this.$set(item, 'loading', false);