项目列表

dist/index.html

@@ -12,7 +12,7 @@
 			document.write('<script src="' + src + '"><\/script>');
 			})();
     </script>
-    <script type="module" crossorigin src="./assets/index.10d08de1.js"></script>
+    <script type="module" crossorigin src="./assets/index.48c5a837.js"></script>
     <link rel="modulepreload" href="./js/@vue/@vue.5bfcce30.js">
     <link rel="modulepreload" href="./js/vue-router/vue-router.ccba075e.js">
     <link rel="modulepreload" href="./js/vue-demi/vue-demi.4f3c4c97.js">

src/components/businessMoudle/dataManagement/acStatement.vue/hooks/index.ts

@@ -10,6 +10,7 @@ export const ExpIndex = () => {
   const dataListRef = ref()
   const acTrendRef = ref<{change: ()=>void}>()
   const teamRef = ref()
+  const projectRef = ref()
   const acRef = ref()
   const userRef = ref()
   const pageInfo = reactive({
@@ -26,9 +27,17 @@ export const ExpIndex = () => {
     acList: [],
     userList: [],
     teamList: [],
+    projectList: [],//项目
+    departList: [],//部门
+    project_ids: [],
+    department_ids: [],
     user_ids: [],//优化师
     account_ids: [],//账号
     team_ids: [],//团队
+    departmentProps: {
+      children: 'childs',
+      label: 'name',
+    }
   })
 
   /**获取账户列表 */
@@ -57,7 +66,29 @@ export const ExpIndex = () => {
     })
   }
 
+  /**项目列表 */
+  const getProjectList = async (page?:any,pageSize?:any) => {
+    let res:any = await http.get(Api.project_list,{})
+    if(res&&res.errNo=='0'){
+      pageInfo.projectList = res.rst
+    }else{
+      ElMessage.error(res.errMsg)
+    }
+  }
+
+  /**部门列表 */
+  const getDepartList = async () => {
+    let res:any = await http.get(Api.depart_list)
+    if(res&&res.errNo=='0'){
+      let resNew:any = res.rst
+      pageInfo.departList = resNew
+    }else{
+      ElMessage.error(res.errMsg)
+    }
+  }
+
   return {
+    projectRef,
     dataListRef,
     projectDataListRef,
     acTrendRef,
@@ -67,6 +98,8 @@ export const ExpIndex = () => {
     pageInfo,
     init_acList,
     getUserList,
-    getTeamList
+    getTeamList,
+    getProjectList,
+    getDepartList
   }
 }

src/components/businessMoudle/dataManagement/acStatement.vue/hooks/trend.ts

@@ -12,7 +12,9 @@ export interface IReportTrend {
   user_ids?: any[],
   account_ids?: any[],
   team_ids?: any[],
-  top_num: number
+  top_num: number,
+  project_ids?: any[],
+  department_ids?: any[]
 }
 
 export const ExpTrend = () => {

src/components/businessMoudle/dataManagement/acStatement.vue/index.vue

@@ -24,11 +24,51 @@
     <div class="flex tMar15">
       <div class="label">筛选维度：</div>
       <div class="flex flex_1">
-        <el-input v-model="pageInfo.keyword" v-if="pageInfo.data_group != 'project'" style="width: 200px" placeholder="请输入关键词" clearable @clear="init" @keyup.enter.native="init">
-          <template #append>
-            <el-button :icon="Search" @click="init"/>
+        <template v-if="pageInfo.data_group != 'project'" >
+          <el-input v-model="pageInfo.keyword" style="width: 200px" placeholder="请输入关键词" clearable @clear="init" @keyup.enter.native="init">
+            <template #append>
+              <el-button :icon="Search" @click="init"/>
+            </template>
+          </el-input>
+          <template v-if="userInfo?.userAuth <= 10">
+            <div class="label lMar20 rMar10">团队</div>
+            <Select ref="teamRef"
+                  selectWidth="180px"
+                  @changeEvent="selectChange('teamRef')" @clearEvent="selectChange('teamRef')"
+                  :isMultiple="true"
+                  :filterFlag="true"
+                  :optObj="{k:'id',la:'name',val:'id'}"
+                  :options="pageInfo.teamList"/>
           </template>
-        </el-input>
+        </template>
+
+        <template v-if="pageInfo.data_group == 'project'">
+          <div class="label lMar20 rMar10">项目</div>
+          <Select ref="projectRef"
+              selectWidth="180px"
+              @changeEvent="selectChange('projectRef')" @clearEvent="selectChange('projectRef')"
+              :isMultiple="true"
+              :filterFlag="true"
+              :optObj="{k:'id',la:'name',val:'id'}"
+              :options="pageInfo.projectList"/>
+          <div class="label lMar20 rMar10">部门</div>
+          <el-tree-select
+            v-model="pageInfo.department_ids"
+            :data="pageInfo.departList"
+            :props="pageInfo.departmentProps"
+            node-key="id"
+            multiple
+            collapse-tags
+            clearable
+            check-strictly
+            :render-after-expand="false"
+            show-checkbox
+            @clear="selectChange('departmentRef')"
+            @change="selectChange('departmentRef')"
+            style="width: 240px"
+          />
+        </template>
+
         <div class="label lMar20 rMar10">优化师</div>
         <Select ref="userRef"
               selectWidth="180px"
@@ -37,16 +77,6 @@
               :filterFlag="true"
               :optObj="{k:'id',la:'username',val:'id'}"
               :options="pageInfo.userList"/>
-        <template v-if="userInfo?.userAuth <= 10">
-          <div class="label lMar20 rMar10">团队</div>
-          <Select ref="teamRef"
-                selectWidth="180px"
-                @changeEvent="selectChange('teamRef')" @clearEvent="selectChange('teamRef')"
-                :isMultiple="true"
-                :filterFlag="true"
-                :optObj="{k:'id',la:'name',val:'id'}"
-                :options="pageInfo.teamList"/>
-        </template>
         <div class="label lMar20 rMar10">账户</div>
         <Select ref="acRef"
               selectWidth="180px"
@@ -77,6 +107,7 @@ import projectDataList from './projectDataList.vue'
 const userInfo = ref()
 const showDateGroup = ref(true)
 const {
+  projectRef,
   projectDataListRef,
   dataListRef,
   acTrendRef,
@@ -86,7 +117,9 @@ const {
   pageInfo,
   init_acList,
   getUserList,
-  getTeamList
+  getTeamList,
+  getProjectList,
+  getDepartList
 } = ExpIndex()
 
 /**点击数据维度 */
@@ -108,30 +141,44 @@ const selectChange = (key) => {
   if(key == 'acRef') {
     pageInfo.account_ids = acRef.value?.value;
   }
+  if(key == 'projectRef') {
+    pageInfo.project_ids = projectRef.value?.value;
+  }
   init()
 }
 
 const init = () => {
-  nextTick(()=>{
-    if(acTrendRef.value) {
-      acTrendRef.value.change()
-    }
-    if(pageInfo.data_group == 'project') {
-      if(projectDataListRef.value) {
-        projectDataListRef.value.init(1)
+  if(pageInfo.data_group == 'project') {
+      pageInfo.keyword = '';
+      pageInfo.team_ids = [];
+      nextTick(()=>{
+        if(acTrendRef.value) {
+          acTrendRef.value.change()
+        }
+        if(projectDataListRef.value) {
+          projectDataListRef.value.init(1)
+        }
+      })
+  }else{
+    pageInfo.project_ids = [];
+    pageInfo.department_ids = [];
+    nextTick(()=>{
+      if(acTrendRef.value) {
+        acTrendRef.value.change()
       }
-    }else {
       if(dataListRef.value) {
         dataListRef.value.init(1)
       }
-    }
-  })
+    })
+  }
 }
 
 onBeforeMount(()=>{
   userInfo.value = JSON.parse(getCookie('userInfo') as string)
   init_acList()
   getUserList()
+  getProjectList()
+  getDepartList()
   if(userInfo.value?.userAuth <= 10){//管理员
     getTeamList()
   }

src/components/businessMoudle/dataManagement/acStatement.vue/projectDataList.vue

@@ -125,7 +125,8 @@ const exportEvent = async () => {
     dimension: dimensionRef.value?.value,
     sys_user_ids: props.mainPageInfo.user_ids,
     account_ids: props.mainPageInfo.account_ids,
-    team_ids: props.mainPageInfo.team_ids,
+    project_ids: props.mainPageInfo.project_ids,
+    department_ids: props.mainPageInfo.department_ids,
   }
   if (tableInfo.sortKey) {
     params['field'] = tableInfo.sortKey
@@ -141,6 +142,12 @@ const exportEvent = async () => {
         key_value: "time",
         label: "时间",
         tooltip: ""
+      },{
+        disabled: 1,
+        if_sort: 0,
+        key_value: "project_name",
+        label: "项目名称",
+        tooltip: ""
       }].concat(res.rst.data?.explain)
 
     let tHeader = descol.map((v) => {
@@ -175,7 +182,8 @@ const init = async (page?: any, pageSize?: any) => {
     dimension: dimensionRef.value?.value,
     sys_user_ids: props.mainPageInfo.user_ids,
     account_ids: props.mainPageInfo.account_ids,
-    team_ids: props.mainPageInfo.team_ids,
+    project_ids: props.mainPageInfo.project_ids,
+    department_ids: props.mainPageInfo.department_ids,
   }
   if (tableInfo.sortKey) {
     params['field'] = tableInfo.sortKey
@@ -191,6 +199,12 @@ const init = async (page?: any, pageSize?: any) => {
         key_value: "time",
         label: "时间",
         tooltip: ""
+      },{
+        disabled: 1,
+        if_sort: 0,
+        key_value: "project_name",
+        label: "项目名称",
+        tooltip: ""
       }].concat(res.rst?.data?.explain);
     tableInfo.tableList = res.rst?.data?.list;
     tableInfo.total = res.rst?.pageInfo.total
@@ -207,6 +221,10 @@ const getSummaries = (param) => {
   const sums: string[] = []
   columns.forEach((column, index) => {
     if (index === 0) {
+      sums[index] = ''
+      return
+    }
+    if (index === 1) {
       sums[index] = '合计'
       return
     }

src/components/businessMoudle/dataManagement/acStatement.vue/trend.vue

@@ -18,6 +18,7 @@
                   :optObj="{k:'key',la:'name',val:'key'}"
                   :options="overviewData.list"/>
           <Select ref="topNumRef"
+                  :disableFlag="mainPageInfo.data_group == 'project' ? true : false"
                   selectWidth="180px"
                   @changeEvent="change" @clearEvent="change"
                   :isMultiple="false"
@@ -104,7 +105,11 @@ const change = () => {
     overviewRef.value.value = 'cost'
   }
   if (topNumRef.value && !topNumRef.value.value) {
-    topNumRef.value.value = 0
+    if(props.mainPageInfo.data_group == 'project') {
+      topNumRef.value.value = 10
+    }else{
+      topNumRef.value.value = 0
+    }
   }
   if(tabInfo.value == 'trend') {
     reportTrendEvent({
@@ -117,6 +122,8 @@ const change = () => {
       user_ids: props.mainPageInfo.user_ids,
       account_ids: props.mainPageInfo.account_ids,
       team_ids: props.mainPageInfo.team_ids,
+      project_ids: props.mainPageInfo.project_ids,
+      department_ids: props.mainPageInfo.department_ids
     })
   }
   if(tabInfo.value == 'ratio'){//占比分析
@@ -133,6 +140,8 @@ const change = () => {
       user_ids: props.mainPageInfo.user_ids,
       account_ids: props.mainPageInfo.account_ids,
       team_ids: props.mainPageInfo.team_ids,
+      project_ids: props.mainPageInfo.project_ids,
+      department_ids: props.mainPageInfo.department_ids
     })
   }