Merge branch 'feature/4月-菜单和权限' into dev

src/components/app/taskView.vue

@@ -285,6 +285,7 @@ export default {
       that.loadingBtn = true;
 
       let para = {
+        type: 999,
         search: that.conditionObj.searchInput || '', // 搜索字段
         gicEnterpriseId: that.activeBrand, // 品牌 id
         startDate: that.conditionObj.dateRange[0] || '',
@@ -375,6 +376,7 @@ export default {
       let that = this;
       that.loading = true;
       let para = {
+        type: 999,
         startDate: that.conditionObj.dateRange[0] || '',
         endDate: that.conditionObj.dateRange[1] || '',
         search: that.conditionObj.searchInput || '', // 搜索字段

src/views/enterpriseData/enterpriseUseData.vue

@@ -230,9 +230,9 @@ export default {
           let resData = res.data;
           if (resData.errorCode == 1) {
             if (resData.result.result) {
-              resData.result.result.forEach(ele => {
-                ele.loginRate = Math.round((ele.loginClerkCnt / ele.totalClerkCnt).toFixed(3) * 100) + '%';
-              });
+              // resData.result.result.forEach(ele => {
+              //   ele.loginRate = Math.round((ele.loginClerkCnt / ele.totalClerkCnt).toFixed(3) * 100) + '%';
+              // });
             }
             that.processData = resData.result.result || [];
             return false;