eoss-ui 0.7.72 → 0.7.74

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

@@ -104,6 +104,11 @@ export default {
           text: '个人资料',
           icon: 'es-icon-yonghu'
         },
+        {
+          type: 'notice',
+          icon: 'es-icon-xiaoxi',
+          text: '消息'
+        },
         {
           type: 'set',
           icon: 'es-icon-shezhi',

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

@@ -60,33 +60,31 @@
             </span>
           </div>
           <div class="es-simplicitytop-menu-children">
-            <template v-for="(child, i) in myRemind">
+            <!-- <my-remind :list="myRemindMenu"></my-remind> -->
+            <div
+              class="es-simplicitytop-menu-children-item"
+              v-for="(child, i) in myRemindMenu"
+              :key="i"
+              @click="remindSelect(child)"
+            >
+              <div class="es-simplicitytop-menu-children-icon">
+                <i
+                  :class="child.icons ? child.icons : 'es-icon-application'"
+                ></i>
+              </div>
+              <div class="es-simplicitytop-menu-children-name">
+                {{ child.text || child.name }}
+              </div>
               <div
-                class="es-simplicitytop-menu-children-item"
-                v-if="child.hasPermission"
-                :key="i"
-                @click="handleSelect(child)"
+                class="es-simplicitytop-menu-children-badge"
+                v-if="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>
+                {{ child.num }}
               </div>
-            </template>
+            </div>
           </div>
         </div>
-        <div
-          class="es-simplicitytop-menu-item"
-          v-if="userCommonMenuList.length > 0"
-        >
+        <div class="es-simplicitytop-menu-item" v-if="myShortcut.length > 0">
           <div class="es-simplicitytop-menu-title">
             <span class="es-simplicitytop-menu-name">我的快捷</span>
           </div>
@@ -94,10 +92,9 @@
             <div class="es-simplicitytop-menu-children">
               <div
                 class="es-simplicitytop-menu-children-item"
-                v-for="(child, i) in userCommonMenuList"
-                v-if="child.hasPermission"
+                v-for="(child, i) in myShortcut"
                 :key="i"
-                @click="handleSelect(child)"
+                @click="remindSelect(child)"
               >
                 <div class="es-simplicitytop-menu-children-icon">
                   <i
@@ -188,7 +185,7 @@
         ></message>
         <!-- 消息列表 end-->
         <!-- 应用 -->
-        <apps
+        <!-- <apps
           :visible.sync="showApps"
           :menu-icon="menuIcon"
           :color="appColor"
@@ -198,7 +195,7 @@
           :systems="systems"
           :user="user"
           @click="handlerClickApps"
-        ></apps>
+        ></apps> -->
         <!-- 应用 end -->
 
         <!-- AI/IM -->
@@ -296,8 +293,8 @@
 <script>
 import avatar from './avatar.vue';
 import handler from './handler.vue';
-import subMenu from './sub-menu.vue';
-import apps from './apps.vue';
+// import subMenu from './sub-menu.vue';
+// import apps from './apps.vue';
 import user from './user.vue';
 import message from './message.vue';
 import notice from './notice.vue';
@@ -324,61 +321,60 @@ import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = /MSIE|Trident/.test(navigator.userAgent);
 const systemMode = util.win.systemMode || 'default';
-import WujieVue from 'wujie-vue2';
-let events = [
-  (tabs, index, that) => {
-    let tab = tabs[index];
-    if (tab.method == 'iframe') {
-      tabs[index].url = util.handlerUrl(tab.url);
-    }
-    if (tab.method === 'wujie' && tab.appCode) {
-      const url = tab.url;
-      tab.url = '';
-      that.$nextTick(() => {
-        tab.url = url;
-      });
-    }
-    if (tab.method === 'router') {
-      that.$set(tabs[index], 'keys', util.uuid());
-    }
-    return tabs;
-  },
-  (tabs, index, that) => {
-    let i = util.indexOfObj(tabs, that.activeName, 'id');
-    if (tabs.length == 1) {
-      that.activeName = '';
-    } else if (i == index) {
-      if (index < tabs.length - 1) {
-        that.activeName = tabs[index + 1].id;
-      } else {
-        that.activeName = tabs[index - 1].id;
-      }
-    }
-    tabs.splice(index, 1);
-    return tabs;
-  },
-  (tabs, index, that) => {
-    let tab = tabs.slice(index, index + 1);
-    that.activeName = tab[0].id;
-    return tab;
-  },
-  (tabs, index, that) => {
-    let i = util.indexOfObj(tabs, that.activeName, 'id');
-    if (i < index) {
-      that.activeName = tabs[index].id;
-    }
-    tabs.splice(0, index);
-    return tabs;
-  },
-  (tabs, index, that) => {
-    let i = util.indexOfObj(tabs, that.activeName, 'id');
-    if (i > index) {
-      that.activeName = tabs[index].id;
-    }
-    tabs.splice(index + 1, tabs.length - index);
-    return tabs;
-  }
-];
+// let events = [
+//   (tabs, index, that) => {
+//     let tab = tabs[index];
+//     if (tab.method == 'iframe') {
+//       tabs[index].url = util.handlerUrl(tab.url);
+//     }
+//     if (tab.method === 'wujie' && tab.appCode) {
+//       const url = tab.url;
+//       tab.url = '';
+//       that.$nextTick(() => {
+//         tab.url = url;
+//       });
+//     }
+//     if (tab.method === 'router') {
+//       that.$set(tabs[index], 'keys', util.uuid());
+//     }
+//     return tabs;
+//   },
+//   (tabs, index, that) => {
+//     let i = util.indexOfObj(tabs, that.activeName, 'id');
+//     if (tabs.length == 1) {
+//       that.activeName = '';
+//     } else if (i == index) {
+//       if (index < tabs.length - 1) {
+//         that.activeName = tabs[index + 1].id;
+//       } else {
+//         that.activeName = tabs[index - 1].id;
+//       }
+//     }
+//     tabs.splice(index, 1);
+//     return tabs;
+//   },
+//   (tabs, index, that) => {
+//     let tab = tabs.slice(index, index + 1);
+//     that.activeName = tab[0].id;
+//     return tab;
+//   },
+//   (tabs, index, that) => {
+//     let i = util.indexOfObj(tabs, that.activeName, 'id');
+//     if (i < index) {
+//       that.activeName = tabs[index].id;
+//     }
+//     tabs.splice(0, index);
+//     return tabs;
+//   },
+//   (tabs, index, that) => {
+//     let i = util.indexOfObj(tabs, that.activeName, 'id');
+//     if (i > index) {
+//       that.activeName = tabs[index].id;
+//     }
+//     tabs.splice(index + 1, tabs.length - index);
+//     return tabs;
+//   }
+// ];
 export default {
   name: 'SimplicityTop',
   provide() {
@@ -391,8 +387,8 @@ export default {
   components: {
     avatar,
     handler,
-    subMenu,
-    apps,
+    // subMenu,
+    // apps,
     user,
     message,
     notice,
@@ -602,47 +598,7 @@ export default {
       currentPage: {
         method: ''
       },
-      userCommonMenuList: [
-        {
-          id: '712207aec84a426c842c86f34c7293c2',
-          menutype: 1,
-          text: '新建公文',
-          menuurl: '/archives-ui/webpack/index.html#/dispatch/add',
-          systemurl: null,
-          icons: '',
-          sort: 4,
-          appCode: 'dispatch_org',
-          urlopenmode: 0,
-          defaultMenu: 1,
-          pid: 'cc529d06f2fe4c9aa5956e7f540b8cd2'
-        },
-        {
-          id: '00c9e4e6e9974a789dbf2d99620c1773',
-          menutype: 1,
-          text: '资料发送',
-          menuurl: '/oa/sharefiles/send/listYb.dhtml',
-          systemurl: null,
-          icons: '',
-          sort: 5,
-          appCode: 'sharefilesSend',
-          urlopenmode: 0,
-          defaultMenu: 1,
-          pid: 'd648a3e7ae16458a823fdbe911e4d76e'
-        },
-        {
-          id: '7588320f81dd49d09fd8832037b1c57a',
-          menutype: 0,
-          text: '收文补录',
-          menuurl: '/archives-ui/webpack/index.html#/receipt/add',
-          systemurl: null,
-          icons: '',
-          sort: 1,
-          appCode: 'receiptAdd',
-          urlopenmode: 0,
-          defaultMenu: 0,
-          pid: 'ec4a6e89b1b346a4a2e8f4245e315da3'
-        }
-      ],
+      userCommonMenuList: [],
       //是否显示头像
       showAvatar: this.avatar,
       // 问候语
@@ -1052,12 +1008,12 @@ export default {
       deep: true,
       handler() {
         // console.log('menuTips', this.menuTips);
-
-        this.setTips(this.userApps);
-        this.setTips(this.applications);
-        this.setTips(this.business);
-        this.setTips(this.systems);
-        this.setTips(this.menus);
+        // this.setTips(this.userApps);
+        // this.setTips(this.applications);
+        // this.setTips(this.business);
+        // this.setTips(this.systems);
+        // this.setTips(this.menus);
+        this.getNums();
       }
     },
     scene(val) {
@@ -1070,20 +1026,23 @@ export default {
     this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
-    console.log(
-      this.menuUrl,
-      this.topLogo,
-      this.hides,
-      this.showSimplicityTop,
-      'this.menuUrl'
-    );
-
     // this.handleListener();
-    this.getNums();
     window.top.jumpMenu = window.top.jumpTopMenu = this.handleSelect;
     this.queryChildMenuData();
   },
   methods: {
+    remindSelect(menu) {
+      let fourthTabs = [];
+      if (menu.children && menu.children.length > 0) {
+        fourthTabs = [...menu.children];
+      } else {
+        fourthTabs = [...menu];
+      }
+      this.fourthTabs = [...fourthTabs];
+      this.tabActiveName = fourthTabs[0].id;
+      this.appCodes = this.fourthTabs[0].appCode;
+      this.currentPage = this.setIframeType(this.fourthTabs[0]);
+    },
     /**
      * queryChildMenu: 查询左侧我的提醒和我的快捷菜单
      */
@@ -1095,11 +1054,10 @@ export default {
         })
         .then((res) => {
           if (res.rCode === 0) {
-            console.log(res.results, 'res.results');
             const tree = this.flatToNestedTree(res.results);
-            console.log(tree, 'tree');
-            this.myRemindMenu = tree[0];
-            this.myShortcut = tree[1];
+            this.myRemindMenu = [...tree[0].children];
+            this.myShortcut = [...tree[1].children];
+            this.getNums();
           }
         });
     },
@@ -1146,11 +1104,8 @@ export default {
     // tab点击事件
     fourthTabClick(res) {
       const index = res.index;
-      this.currentPage = {
-        ...this.fourthTabs[index]
-      };
+      this.currentPage = {};
       this.appCodes = this.fourthTabs[index].appCode;
-      console.log(this.currentPage, 'this.currentPage');
 
       // console.log(this.fourthTabs[index], 'this.fourthTabs[index]');
       // 增加阻塞 重载页面
@@ -1159,12 +1114,12 @@ export default {
       }, 0);
     },
     //获取数量
-    getNums() {
-      this.getIndexCount();
-      this.getUserTipsInstanceNum(0);
-      this.getUserTipsInstanceNum(1);
-      this.getShareFilesReceiveCountNew();
-      this.getVoteMeetingNum();
+    async getNums() {
+      await this.getIndexCount();
+      await this.getUserTipsInstanceNum(0);
+      await this.getUserTipsInstanceNum(1);
+      await this.getShareFilesReceiveCountNew();
+      await this.getVoteMeetingNum();
       this.reladding = true;
       if (this.reladding) {
         setTimeout(() => {
@@ -1187,7 +1142,13 @@ export default {
         })
         .then((res) => {
           if (res.rCode === 0) {
-            this.myRemind[5].num = res.results > 99 ? '99+' : res.results;
+            const myRemindMenu = [...this.myRemindMenu];
+            myRemindMenu.forEach((item) => {
+              if (item.appCode === 'conference_meeting') {
+                item.num = res.results > 99 ? '99+' : res.results;
+              }
+            });
+            this.myRemindMenu = [...myRemindMenu];
           }
         });
     },
@@ -1205,7 +1166,13 @@ export default {
         })
         .then((res) => {
           if (res.rCode === 0) {
-            this.myRemind[4].num = res.results > 99 ? '99+' : res.results;
+            const myRemindMenu = [...this.myRemindMenu];
+            myRemindMenu.forEach((item) => {
+              if (item.appCode === 'favoriteCount') {
+                item.num = res.results > 99 ? '99+' : res.results;
+              }
+            });
+            this.myRemindMenu = [...myRemindMenu];
           }
         });
     },
@@ -1229,11 +1196,14 @@ export default {
         })
         .then((res) => {
           if (res.rCode === 0) {
-            if (type) {
-              this.myRemind[3].num = res.results > 99 ? '99+' : res.results;
-            } else {
-              this.myRemind[2].num = res.results > 99 ? '99+' : res.results;
-            }
+            const appCode = type ? 'wdtxjqgw' : 'wdtxgwqssignList';
+            const myRemindMenu = [...this.myRemindMenu];
+            myRemindMenu.forEach((item) => {
+              if (item.appCode === appCode) {
+                item.num = res.results > 99 ? '99+' : res.results;
+              }
+            });
+            this.myRemindMenu = [...myRemindMenu];
           } else {
             console.error('查询待签收/据签收任务数量失败', res);
           }
@@ -1253,11 +1223,15 @@ export default {
         })
         .then((res) => {
           if (res.rCode === 0) {
+            // 待办
             const makePendingCount = res.results.makePendingCount || 0;
-            const pendedCount = res.results.pendedCount || 0;
-            this.myRemind[0].num =
-              makePendingCount > 99 ? '99+' : makePendingCount;
-            this.myRemind[1].num = pendedCount > 99 ? '99+' : pendedCount;
+            const myRemindMenu = [...this.myRemindMenu];
+            myRemindMenu.forEach((item) => {
+              if (item.appCode === 'makePendingCount') {
+                item.num = makePendingCount > 99 ? '99+' : makePendingCount;
+              }
+            });
+            this.myRemindMenu = [...myRemindMenu];
           } else {
             console.error('查询待办任务数量失败', res);
           }
@@ -1955,6 +1929,9 @@ export default {
                   this.$refs.message.getMsg(true);
                 }
               }
+              if (i === 'menuTipsMap') {
+                this.getNums();
+              }
               if (i === 'menuTipsMap' && data[i] !== null) {
                 this.menuTips = data[i];
               }
@@ -2000,120 +1977,6 @@ export default {
     handleDelete(index) {
       this.newApps.splice(index, 1);
     },
-    /**
-     * @desc:储存更多应用菜单点击
-     * @author huangbo
-     * @date 2024年9月7日
-     **/
-    handlerClickApps(res) {
-      if (res.permission === false) {
-        return false;
-      }
-      let i = util.indexOfObj(this.newApps, res, 'id');
-      if (i == -1) {
-        this.newApps.push(res);
-      }
-      this.handlerClickApp(res);
-    },
-    /**
-     * @desc:侧边应用菜单点击
-     * @author huangbo
-     * @date 2024年9月7日
-     **/
-    handlerClickApp(res) {
-      this.showMsg = false;
-      this.showSet = false;
-      this.fold = false;
-      this.showApps = false;
-      this.drawer.visible = false;
-      if (res) {
-        if (res.permission === false) {
-          return false;
-        }
-        if (
-          (res.children && res.children.length) ||
-          (res.fourthTabs && res.fourthTabs.length)
-        ) {
-          this.subMenus = res;
-          this.showMenu = true;
-        } else {
-          this.subMenus = null;
-          this.showMenu = false;
-        }
-        let set = true;
-        if (res.url) {
-          if (res.urlopenmode == 1 || res.openModel == 1) {
-            set = false;
-            util.win.open(res.url);
-          } else if (res.urlopenmode == 2 || res.openModel == 2) {
-            set = false;
-            util.win.open(res.url, '_self');
-          } else {
-            let i = util.indexOfObj(this.tabs, res, 'id');
-            this.activeName = res.id;
-            if (i == -1) {
-              let obj = res.code
-                ? this.getMenu(this.menus, res.code, 'appCode')
-                : null;
-              if (obj) {
-                obj = JSON.parse(JSON.stringify(obj));
-                let n = util.indexOfObj(this.tabs, obj, 'id');
-                if (n == -1) {
-                  let tab = this.setIframeType(obj);
-                  this.tabs.push(tab);
-                  this.activeName = tab.id;
-                } else {
-                  if (obj.method == 'iframe') {
-                    obj.url = util.handlerUrl(obj.url);
-                  }
-                }
-              } else {
-                let tab = this.setIframeType(res);
-                this.tabs.push(tab);
-                this.activeName = tab.id;
-              }
-            } else {
-              if (res.method == 'iframe') {
-                res.url = util.handlerUrl(res.url);
-              }
-            }
-          }
-        }
-        if (set && res.code) {
-          let subMenus = this.getMenu(this.menus, res.code, 'appCode');
-          if (!subMenus && !res.url) {
-            this.$alert('没有关联菜单，请联系管理员！', '提示', {
-              confirmButtonText: '确定',
-              type: 'warning'
-            }).catch(() => {});
-          } else {
-            this.title = res.text || res.name;
-            this.subMenus = subMenus ? subMenus : null;
-            this.showMenu = subMenus
-              ? (subMenus.children && subMenus.children.length > 0) ||
-                (subMenus.fourthTabs && subMenus.fourthTabs.length > 0)
-              : false;
-            this.showApps = false;
-            if (subMenus && subMenus.url) {
-              subMenus = JSON.parse(JSON.stringify(subMenus));
-              let i = util.indexOfObj(this.tabs, subMenus, 'id');
-              this.activeName = subMenus.id;
-              if (i == -1) {
-                let tab = this.setIframeType(subMenus);
-                this.tabs.push(tab);
-              } else {
-                if (subMenus.method == 'iframe') {
-                  this.tabs[i].url = util.handlerUrl(subMenus.url);
-                }
-              }
-            }
-          }
-        }
-        this.active = res.id;
-      } else {
-        this.showApps = !this.showApps;
-      }
-    },
     /**
      * @desc:显示Drawer界面
      * @author huangbo
@@ -2488,6 +2351,7 @@ export default {
     handleLayout(res, active) {
       if (active) {
         localStorage.setItem('layout', active);
+        localStorage.setItem('layoutType', active);
       }
       this.$emit('chang-layout', res, active);
     },