Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbSummaryServiceImpl.java

@@ -3,6 +3,7 @@ package com.dsk.cscec.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -83,9 +84,9 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
 //                cbProjectFileMapper.removeById(cbProjectFile.getId());
 //            } else {
                 try {
-                    if (cbProjectFile.getFileName().equals("成本汇总项目结构汇总")) {
+                    if (FileNameUtil.getPrefix(cbProjectFile.getFileName()).equals("成本汇总项目结构汇总")) {
                         saveCbSummaryProject(projectId, cbProjectFile);
-                    } else if (cbProjectFile.getFileName().equals("成本汇总按成本科目")) {
+                    } else if (FileNameUtil.getPrefix(cbProjectFile.getFileName()).equals("成本汇总按成本科目")) {
                         saveCbSummaryCostAccount(projectId, cbProjectFile);
                     } else {
                         throw new ServiceException("文件名错误");

dsk-operate-ui/src/utils/request.js

@@ -108,7 +108,7 @@ service.interceptors.response.use(res => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
             sessionStorage.removeItem('views')
-            location.href = '/index';
+            location.href = '/index/gys';
           })
       }).catch(() => {
         isRelogin.show = false;

dsk-operate-ui/src/views/projectCostLedger/detail/components/OtherProjects/index.vue

@@ -164,7 +164,7 @@ export default {
       ],
       menuOptions: {
         nodeName: "itemContent",
-        nodeValue: "itemContent",
+        nodeValue: "menuId",
       },
       dialogVisible:false,
       currentList: "type1",

dsk-operate-ui/src/views/projectCostLedger/detail/components/ProjectSideMenu/ProjectMenuItem.vue

@@ -7,7 +7,7 @@
           :class="`project-sub-menu-item-level-${menuItem.level}`" :disabled="menuItem.originData && menuItem.originData.disabled">
           <template slot="title">
             <!-- 预留插槽 -->
-            <div class="project-sub-menu-title" :class="{'project-sub-menu-title-next' : menuItem.level !== 1}" :style="menuStyles(menuItem)">
+            <div class="project-sub-menu-title" :class="{'project-sub-menu-title-next' : menuItem.level !== 1}" :style="menuStyles(menuItem)" :title="menuItem.nodeName">
               <slot :name="`${menuItem.nodeName}-${menuItem.level}`" :data="menuItem">
                 <img src="" alt="" v-if="menuItem.originData && menuItem.originData.icon">
                 <div class="project-sub-menu-title-text">{{menuItem.nodeName}}</div>
@@ -25,7 +25,7 @@
           <template slot="title">
             <div class="project-only-menu-title-container">
               <!-- 预留插槽 -->
-              <div class="project-only-menu-title" :class="{'project-only-menu-title-next' : menuItem.level !== 1}" :style="menuStyles(menuItem)">
+              <div class="project-only-menu-title" :class="{'project-only-menu-title-next' : menuItem.level !== 1}" :style="menuStyles(menuItem)" :title="menuItem.nodeName">
                 <slot :name="`${menuItem.nodeName}-${menuItem.level}`" :data="menuItem">
                   <img src="" alt="" v-if="menuItem.originData && menuItem.originData.icon">
                   <div class="project-only-menu-title-text">{{menuItem.nodeName}}</div>