Merge branch 'wsbx' into report_test0818

# Conflicts:
#	src/views/report/Overvoew.vue

src/views/report/Caseess.vue

@@ -125,9 +125,11 @@ import * as api from "../../api/indexOvervoew";
 import downLoad from "../../utils/downLoad";
 import Cookies from "vue-cookies";
 import axios from "axios";
+import {useStore} from 'vuex'
 export default {
   name: "CaseesS",
   setup() {
+    const store = useStore();
     const state = reactive({
       tableLoading: false, // table加载图标
       tableDataTotal: 0, // 数据总条数
@@ -157,11 +159,38 @@ export default {
     const getOrgList = async () => {
       //todo 获取用户角色列表，判断里面是否有system-admin
       // let roleList = store.state.userInfo.roleList;
+      var manageFlag = false;
+      for(let i=0;i<store.state.userInfo.roleList.length;i++){
+        if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
+          manageFlag = true;
+          break;
+        }
+      }
       const res = await api.userGetUserOrg();
       if (res) {
-        state.option = res.data?.result.orgTreeList;
+        if(manageFlag){
-        state.orgId = res.data?.result.treeNodeList;
+          state.option = [{
-        state.resetOrgId = res.data?.result.treeNodeList;
+            orgName:"全部",
+            organizationId: null,
+            childList:res.data?.result.orgTreeList
+          }];
+          state.orgId = [null,...res.data?.result.treeNodeList];
+          state.resetOrgId = [null,...res.data?.result.treeNodeList];
+        }else{
+          if(res.data?.result.orgTreeList!=null){
+            state.option = res.data?.result.orgTreeList;
+            state.orgId = res.data?.result.treeNodeList;
+            state.resetOrgId = res.data?.result.treeNodeList;
+          }else{
+            state.option = [{
+              orgName:"无权限",
+              organizationId: "1",
+              childList:[],
+            }];
+            state.orgId = ["1"];
+            state.resetOrgId = ["1"];
+          }
+        }
         getTableData();
       }
     };

src/views/report/Curriculum.vue

@@ -181,15 +181,42 @@ export default {
     const getOption = async () => {};
     //请求组织接口
     const getOrgList = async () => {
+      var manageFlag = false;
+      for(let i=0;i<store.state.userInfo.roleList.length;i++){
+        if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
+          manageFlag = true;
+          break;
+        }
+      }
       let params = {
         roleList: store.state.userInfo.roleList,
         userId: store.state.userInfo.userId
       }
       const res = await api.userGetUserOrg(params);
       if (res) {
-        state.option = res.data?.result.orgTreeList;
+        if(manageFlag){
-        state.orgId = res.data?.result.treeNodeList;
+          state.option = [{
-        state.resetOrgId = res.data?.result.treeNodeList;
+            orgName:"全部",
+            organizationId: null,
+            childList:res.data?.result.orgTreeList
+          }];
+          state.orgId = [null,...res.data?.result.treeNodeList];
+          state.resetOrgId = [null,...res.data?.result.treeNodeList];
+        }else{
+          if(res.data?.result.orgTreeList!=null){
+            state.option = res.data?.result.orgTreeList;
+            state.orgId = res.data?.result.treeNodeList;
+            state.resetOrgId = res.data?.result.treeNodeList;
+          }else{
+            state.option = [{
+              orgName:"无权限",
+              organizationId: "1",
+              childList:[],
+            }];
+            state.orgId = ["1"];
+            state.resetOrgId = ["1"];
+          }
+        }
         state.allowClear = false
         getTableData();
       }

src/views/report/Employeelearning.vue

@@ -142,9 +142,11 @@ import { message } from "ant-design-vue";
 import Cookies from "vue-cookies";
 import axios from "axios";
 import downLoad from "../../utils/downLoad";
+import { useStore } from "vuex";
 export default {
   name: "EmployeelearninG",
   setup() {
+    const store = useStore();
     const state = reactive({
       tableLoading: false, // table加载图标
       tableDataTotal: 0, // 数据总条数
@@ -216,11 +218,38 @@ export default {
     };
   //请求组织接口
     const getOrgList = async () => {
+      var manageFlag = false;
+      for(let i=0;i<store.state.userInfo.roleList.length;i++){
+        if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
+          manageFlag = true;
+          break;
+        }
+      }
       const res = await api.userGetUserOrg({});
       if (res) {
-        state.option = res.data?.result.orgTreeList;
+        if(manageFlag){
-        state.orgId = res.data?.result.treeNodeList;
+          state.option = [{
-        state.resetOrgId = res.data?.result.treeNodeList;
+            orgName:"全部",
+            organizationId: null,
+            childList:res.data?.result.orgTreeList
+          }];
+          state.orgId = [null,...res.data?.result.treeNodeList];
+          state.resetOrgId = [null,...res.data?.result.treeNodeList];
+        }else{
+          if(res.data?.result.orgTreeList!=null){
+            state.option = res.data?.result.orgTreeList;
+            state.orgId = res.data?.result.treeNodeList;
+            state.resetOrgId = res.data?.result.treeNodeList;
+          }else{
+            state.option = [{
+              orgName:"无权限",
+              organizationId: "1",
+              childList:[],
+            }];
+            state.orgId = ["1"];
+            state.resetOrgId = ["1"];
+          }
+        }
         getTableData();
       }
     };

src/views/report/Learningpathmap.vue

@@ -143,9 +143,11 @@ import downLoad from "../../utils/downLoad";
 import Cookies from "vue-cookies";
 import axios from "axios";
 import dayjs from "dayjs";
+import { useStore } from "vuex";
 export default {
   name: "LearningPathMap",
   setup() {
+    const store = useStore();
     const state = reactive({
       tableLoading: false, // table加载图标
       tableDataTotal: 0, // 数据总条数
@@ -184,14 +186,41 @@ export default {
     const getOrgList = async () => {
       //todo 获取用户角色列表，判断里面是否有system-admin
       // let roleList = store.state.userInfo.roleList;
+      var manageFlag = false;
+      for(let i=0;i<store.state.userInfo.roleList.length;i++){
+        if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
+          manageFlag = true;
+          break;
+        }
+      }
       const res = await api.userGetUserOrg();
       if (res) {
         // state.option = res.data?.result;
         // state.orgId = [state.option[0]?.organizationId];
         // state.resetOrgId = [state.option[0]?.organizationId];
-        state.option = res.data?.result.orgTreeList;
+        if(manageFlag){
-        state.orgId = res.data?.result.treeNodeList;
+          state.option = [{
-        state.resetOrgId = res.data?.result.treeNodeList;
+            orgName:"全部",
+            organizationId: null,
+            childList:res.data?.result.orgTreeList
+          }];
+          state.orgId = [null,...res.data?.result.treeNodeList];
+          state.resetOrgId = [null,...res.data?.result.treeNodeList];
+        }else{
+          if(res.data?.result.orgTreeList!=null){
+            state.option = res.data?.result.orgTreeList;
+            state.orgId = res.data?.result.treeNodeList;
+            state.resetOrgId = res.data?.result.treeNodeList;
+          }else{
+            state.option = [{
+              orgName:"无权限",
+              organizationId: "1",
+              childList:[],
+            }];
+            state.orgId = ["1"];
+            state.resetOrgId = ["1"];
+          }
+        }
         state.allowClear = true;
         getTableData();
       }

src/views/report/Operational.vue

@@ -1565,6 +1565,9 @@ export default {
       state.threeTime = [dayjs(start), dayjs(monthEnd)];
       state.forTime = [dayjs(start), dayjs(monthEnd)];
       state.towParmasn.time = [dayjs(start), dayjs(monthEnd)];
+      state.towParmasn.day = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)];
+      state.threeDay = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)];
+      state.forDay = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)];
       leftMonthChange([dayjs(start), dayjs(monthEnd)]);
       rightMonthChange([dayjs(start), dayjs(monthEnd)]);
       twoMonthChange([dayjs(start), dayjs(monthEnd)]);

src/views/report/Overvoew.vue

@@ -377,12 +377,38 @@ export default {
     };
     //请求组织接口
     const getOrgList = async () => {
+      var manageFlag = false;
+      for(let i=0;i<store.state.userInfo.roleList.length;i++){
+        if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
+          manageFlag = true;
+          break;
+        }
+      }
       const res = await api.userGetUserOrg({});
       if (res) {
-        state.option = res.data?.result?.orgTreeList;
+        if(manageFlag){
-        
+          state.option = [{
-        state.orgId = res.data?.result?.treeNodeList;
+            orgName:"全部",
-        state.resetOrgId = res.data?.result?.treeNodeList;
+            organizationId: null,
+            childList:res.data?.result.orgTreeList
+          }];
+          state.orgId = [null,...res.data?.result.treeNodeList];
+          state.resetOrgId = [null,...res.data?.result.treeNodeList];
+        }else{
+          if(res.data?.result.orgTreeList!=null){
+            state.option = res.data?.result.orgTreeList;
+            state.orgId = res.data?.result.treeNodeList;
+            state.resetOrgId = res.data?.result.treeNodeList;
+          }else{
+            state.option = [{
+              orgName:"无权限",
+              organizationId: "1",
+              childList:[],
+            }];
+            state.orgId = ["1"];
+            state.resetOrgId = ["1"];
+          }
+        }
         state.type = res.data?.result?.userType;
         res.data?.result?.userType === 1
           ? (state.allowClear = true)

src/views/report/ReportExamination.vue

@@ -152,9 +152,11 @@ import { message } from "ant-design-vue";
 import Cookies from "vue-cookies";
 import axios from "axios";
 import downLoad from "../../utils/downLoad";
+import { useStore } from 'vuex';
 export default {
   name: "EmployeelearninG",
   setup() {
+    const store = useStore();
     const state = reactive({
       tableLoading: false, // table加载图标
       tableDataTotal: 0, // 数据总条数
@@ -182,11 +184,38 @@ export default {
     };
   //请求组织接口
     const getOrgList = async () => {
+      var manageFlag = false;
+      for(let i=0;i<store.state.userInfo.roleList.length;i++){
+        if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
+          manageFlag = true;
+          break;
+        }
+      }
       const res = await api.userGetUserOrg({});
       if (res) {
-        state.option = res.data?.result.orgTreeList;
+        if(manageFlag){
-        state.orgId = res.data?.result.treeNodeList;
+          state.option = [{
-        state.resetOrgId = res.data?.result.treeNodeList;
+            orgName:"全部",
+            organizationId: null,
+            childList:res.data?.result.orgTreeList
+          }];
+          state.orgId = [null,...res.data?.result.treeNodeList];
+          state.resetOrgId = [null,...res.data?.result.treeNodeList];
+        }else{
+          if(res.data?.result.orgTreeList!=null){
+            state.option = res.data?.result.orgTreeList;
+            state.orgId = res.data?.result.treeNodeList;
+            state.resetOrgId = res.data?.result.treeNodeList;
+          }else{
+            state.option = [{
+              orgName:"无权限",
+              organizationId: "1",
+              childList:[],
+            }];
+            state.orgId = ["1"];
+            state.resetOrgId = ["1"];
+          }
+        }
         res.data?.result?.userType === 1
           ? (state.allowClear = true)
           : (state.allowClear = false);

src/views/report/ReportProject.vue

@@ -309,15 +309,42 @@ export default {
     };
     //请求组织接口
     const getOrgList = async () => {
+      var manageFlag = false;
+      for(let i=0;i<store.state.userInfo.roleList.length;i++){
+        if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
+          manageFlag = true;
+          break;
+        }
+      }
       let params = {
         roleList: store.state.userInfo.roleList,
         userId: store.state.userInfo.userId
       }
       const res = await api.userGetUserOrg(params);
       if (res) {
-        state.option = res.data?.result.orgTreeList;
+        if(manageFlag){
-        state.orgId = res.data?.result.treeNodeList;
+          state.option = [{
-        state.resetOrgId = res.data?.result.treeNodeList;
+            orgName:"全部",
+            organizationId: null,
+            childList:res.data?.result.orgTreeList
+          }];
+          state.orgId = [null,...res.data?.result.treeNodeList];
+          state.resetOrgId = [null,...res.data?.result.treeNodeList];
+        }else{
+          if(res.data?.result.orgTreeList!=null){
+            state.option = res.data?.result.orgTreeList;
+            state.orgId = res.data?.result.treeNodeList;
+            state.resetOrgId = res.data?.result.treeNodeList;
+          }else{
+            state.option = [{
+              orgName:"无权限",
+              organizationId: "1",
+              childList:[],
+            }];
+            state.orgId = ["1"];
+            state.resetOrgId = ["1"];
+          }
+        }
         state.allowClear = true
         getTableData();
       }