Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/api/bpm/components/inspectionManage/index.js

@@ -37,50 +37,55 @@ export async function getList(params) {
 export async function statistics(params) {
   const res = await request.get('/eam/PdaWorkOrder/statistics', { params });
   if (res.data.code == 0) {
-    console.log('-----statistics---user--------');
-    console.log(store.state.user);
-    if (store.state.user.menus?.length) {
-      for (const p of store.state.user.menus) {
-        console.log('statistics----------------------');
-        console.log(p);
-        if (p.path === '/tickets') {
-          console.log('进来了！~~~~~');
-          store.dispatch('user/setMenuBadge', {
-            path: '/tickets',
-            value: res.data.data.total || 0,
-            color: 'danger'
-          });
-          break;
-        }
-      }
-    } else {
-      const unwatch = Vue.prototype.$watch(
-        '$store.state.user.menus',
-        () => {
-          console.log('-----statistics---user--------');
-          console.log(store.state.user);
-          if (store.state.user.menus?.length) {
-            for (const p of store.state.user.menus) {
-              console.log('statistics----------------------');
-              console.log(p);
-              if (p.path === '/tickets') {
-                console.log('进来了！~~~~~');
-                store.dispatch('user/setMenuBadge', {
-                  path: '/tickets',
-                  value: res.data.data.total || 0,
-                  color: 'danger'
-                });
-                break;
-              }
-            }
-            unwatch();
-          }
-        },
-        {
-          immediate: true
-        }
-      );
-    }
+    store.dispatch('user/setMenuBadge', {
+      path: '/tickets',
+      value: res.data.data.total || 0,
+      color: 'danger'
+    });
+    // console.log('-----statistics---user--------');
+    // console.log(store.state.user);
+    // if (store.state.user.menus?.length) {
+    //   for (const p of store.state.user.menus) {
+    //     console.log('statistics----------------------');
+    //     console.log(p);
+    //     if (p.path === '/tickets') {
+    //       console.log('进来了！~~~~~');
+    //       store.dispatch('user/setMenuBadge', {
+    //         path: '/tickets',
+    //         value: res.data.data.total || 0,
+    //         color: 'danger'
+    //       });
+    //       break;
+    //     }
+    //   }
+    // } else {
+    //   const unwatch = Vue.prototype.$watch(
+    //     '$store.state.user.menus',
+    //     () => {
+    //       console.log('-----statistics---user--------');
+    //       console.log(store.state.user);
+    //       if (store.state.user.menus?.length) {
+    //         for (const p of store.state.user.menus) {
+    //           console.log('statistics----------------------');
+    //           console.log(p);
+    //           if (p.path === '/tickets') {
+    //             console.log('进来了！~~~~~');
+    //             store.dispatch('user/setMenuBadge', {
+    //               path: '/tickets',
+    //               value: res.data.data.total || 0,
+    //               color: 'danger'
+    //             });
+    //             break;
+    //           }
+    //         }
+    //         unwatch();
+    //       }
+    //     },
+    //     {
+    //       immediate: true
+    //     }
+    //   );
+    // }
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));

src/api/bpm/task.js

@@ -9,50 +9,51 @@ export async function getTodoTaskPage(query) {
     data: query
   });
   if (res.data.code == 0) {
-    console.log('-----getTodoTaskPage---user--------');
-    console.log(store.state.user);
-    if (store.state.user.menus?.length) {
-      for (const p of store.state.user.menus) {
-        console.log('getTodoTaskPage----------------------');
-        console.log(p);
-        if (p.path === '/todo') {
-          console.log('进来了2~~~');
-          store.dispatch('user/setMenuBadge', {
-            path: '/todo',
-            value: res.data.data.count || 0,
-            color: 'danger'
-          });
-          break;
-        }
-      }
-    } else {
-      const unwatch = Vue.prototype.$watch(
-        '$store.state.user.menus',
-        () => {
-          console.log('-----getTodoTaskPage---user--------');
-          console.log(store.state.user);
-          if (store.state.user.menus?.length) {
-            for (const p of store.state.user.menus) {
-              console.log('getTodoTaskPage----------------------');
-              console.log(p);
-              if (p.path === '/todo') {
-                console.log('进来了2~~~');
-                store.dispatch('user/setMenuBadge', {
-                  path: '/todo',
-                  value: res.data.data.count || 0,
-                  color: 'danger'
-                });
-                break;
-              }
-            }
-            unwatch();
-          }
-        },
-        {
-          immediate: true
-        }
-      );
-    }
+    store.dispatch('user/setMenuBadge', {
+      path: '/todo',
+      value: res.data.data.count || 0,
+      color: 'danger'
+    });
+    // console.log('-----getTodoTaskPage---user--------');
+    // console.log(store.state.user);
+    // if (store.state.user.menus?.length) {
+    //   for (const p of store.state.user.menus) {
+    //     console.log('getTodoTaskPage----------------------');
+    //     console.log(p);
+    //     if (p.path === '/todo') {
+    //       console.log('进来了2~~~');
+
+    //       break;
+    //     }
+    //   }
+    // } else {
+    //   const unwatch = Vue.prototype.$watch(
+    //     '$store.state.user.menus',
+    //     () => {
+    //       console.log('-----getTodoTaskPage---user--------');
+    //       console.log(store.state.user);
+    //       if (store.state.user.menus?.length) {
+    //         for (const p of store.state.user.menus) {
+    //           console.log('getTodoTaskPage----------------------');
+    //           console.log(p);
+    //           if (p.path === '/todo') {
+    //             console.log('进来了2~~~');
+    //             store.dispatch('user/setMenuBadge', {
+    //               path: '/todo',
+    //               value: res.data.data.count || 0,
+    //               color: 'danger'
+    //             });
+    //             break;
+    //           }
+    //         }
+    //         unwatch();
+    //       }
+    //     },
+    //     {
+    //       immediate: true
+    //     }
+    //   );
+    // }
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -71,7 +72,6 @@ export async function getDoneTaskPage(query) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 export function completeTask(data) {
   return request({
     url: '/bpm/task/complete',
@@ -323,7 +323,6 @@ export async function getProcessInstanceNoticePage(query) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 我的抄送分页
 export async function ccPage(data) {
   const res = await request({
@@ -335,4 +334,4 @@ export async function ccPage(data) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}