fix

dsk-operate-ui/src/components/CustomTable/index.vue

@@ -2,7 +2,7 @@
   <div class="table-list-com-ins" :class="{'is-empty-table' : !tableDataTotal,'no-pagination' : !hasQueryParams,'auto-max-height' : maxHeight}"
     :style="maxBodyFixedStyle">
     <div class="table-item">
-      <el-table v-if="tableDataTotal>0" class="fixed-table" v-loading="tableLoading" :data="tableData" element-loading-text="Loading"
+      <el-table v-if="tableDataTotal>0" class="custom-table" v-loading="tableLoading" :data="tableData" element-loading-text="Loading"
         ref="customTableRef" border fit highlight-current-row :default-sort="defaultSort?defaultSort:{}" @sort-change="sortChange"
         @selection-change="selectionChange" :cell-class-name="cellClassName" :cell-style="cellStyle" :row-class-name="rowClassName"
         :row-style="rowStyle" :height="height" :maxHeight="comMaxHeight" v-sticky-header="stickyHeader">
@@ -343,6 +343,7 @@ export default {
       max-height: 100%;
     }
   }
+
   ::v-deep .table-item {
     width: 100%;
     max-height: calc(100% - 40px);
@@ -400,6 +401,28 @@ export default {
     }
 
     .el-table {
+      &.custom-table {
+        .el-table__body-wrapper {
+          /* 滚动条在最左侧时 */
+          &.is-scrolling-left {
+            & + .el-table__fixed {
+              box-shadow: unset;
+            }
+          }
+          /* 滚动条在最右侧时 */
+          &.is-scrolling-right {
+            /* 右侧固定列 */
+            & + .el-table__fixed + .el-table__fixed-right,
+            & + .el-table__fixed-right {
+              box-shadow: unset;
+            }
+          }
+        }
+        .el-table__fixed-right,
+        .el-table__fixed {
+          box-shadow: 0 0 10px rgba(0, 0, 0, 0.12);
+        }
+      }
       .el-table__header-wrapper {
         min-height: 40px;
       }

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

-import { add, multiply, divide } from "@/utils/decimal.js";
+import { multiply, divide } from "@/utils/decimal.js";
 
 /**
  * 根据屏幕缩放率 来进行样式缩放
@@ -42,7 +42,7 @@ export default class ScreenScal {
    * @returns 
    */
   getDecimal = (num) => {
-    return parseFloat(divide(multiply(num, 100), 100));
+    return parseFloat(divide(multiply(num, 100, 5), 100));
   };
 
   /**
@@ -65,7 +65,7 @@ export default class ScreenScal {
     // 屏幕最终需要适配结果
     const resultCalcZoom = 1 / zoom;
 
-    console.log('系统分辨率', systemResolution, '屏幕分辨率', screenResolution, '浏览器外部宽度', window.outerWidth, '浏览器内部宽度', browserWidth, '总缩放倍数', zoom, "系统最终适配倍数", resultCalcZoom, '浏览器缩放倍数', browserZoom, '系统缩放倍数', systemZoom);
+    // console.log('系统分辨率', systemResolution, '屏幕分辨率', screenResolution, '浏览器外部宽度', window.outerWidth, '浏览器内部宽度', browserWidth, '总缩放倍数', zoom, "系统最终适配倍数", resultCalcZoom, '浏览器缩放倍数', browserZoom, '系统缩放倍数', systemZoom);
 
     return {
       zoom,
@@ -77,7 +77,7 @@ export default class ScreenScal {
   }
 
   /**
-   * 获取用户屏幕缩放倍数
+   * 获取用户屏幕缩放倍数 后期需要考虑 echarts 缩放兼容性问题
    * @returns 
    */
   getZoom() {
@@ -86,7 +86,8 @@ export default class ScreenScal {
       ua = navigator.userAgent.toLowerCase();
 
     if (window.devicePixelRatio !== undefined) {
-      zoom = window.devicePixelRatio;
+      const _devicePixelRatio = window.devicePixelRatio;
+      zoom = _devicePixelRatio > 1 ? window.outerWidth / window.innerWidth : window.devicePixelRatio;
     } else if (~ua.indexOf('msie')) {
       if (screen.deviceXDPI && screen.logicalXDPI) {
         zoom = screen.deviceXDPI / screen.logicalXDPI;

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

@@ -173,7 +173,7 @@ export default {
     projectDetailInfo: {
       handler(newValue) {
         this.comProjectDetailInfo = newValue ? newValue : {};
-        this.getCbDirectExpenseMenuTreeApi(this.comProjectDetailInfo.projectId)
+        this.getCbDirectExpenseMenuTree(this.comProjectDetailInfo.projectId)
         // this.getProjectOtherStatistics(this.comProjectDetailInfo.projectId)
         // this.getProjectOtherStatistics('1762014527685136385')
         // this.init(this.comProjectDetailInfo);
@@ -200,14 +200,15 @@ export default {
   },
   //方法集
   methods: {
-    async getCbDirectExpenseMenuTreeApi(params) {
+    async getCbDirectExpenseMenuTree(params) {
       try {
         const result = await getCbDirectExpenseMenuTreeApi(params);
         if (result.code == 200) {
           const _tempArray = result.data;
           this.menuDetails=_tempArray
           this.menuTreeList.push(_tempArray);
-          const defaultCurrent = this.findMenuNode(this.menuTreeList, "土石方部分");
+          const defaultCurrent = this.findMenuNode(this.menuTreeList, "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程");
+          console.log(defaultCurrent,"defaultCurrent");
           if (defaultCurrent) {
             this.defaultActive = defaultCurrent.menuId;
             this.menuId = defaultCurrent.menuId;

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

@@ -40,7 +40,7 @@
             <custom-table :tableData="dataForm.tableDataList" :formColum="formColum" :max-height="true" :tableDataTotal="total" :paging="false"
               :cell-class-name="cellClassName">
               <template slot="action-field-bar" slot-scope="scope">
-                <div class="project-action-field-bar" v-if="scope.row.id != '0'">
+                <div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">
                   <span class="push-project-use" :class="{'is-emty-quantities' : !parseFloat(scope.row.quantities)}"
                     @click="parseFloat(scope.row.quantities) ? pushProjectUse(scope.row) : ''">推送工程量</span>
                 </div>
@@ -50,7 +50,7 @@
               <template slot="quantities" slot-scope="scope">
                 <!-- 编辑单元格 -->
                 <el-form-item :prop="`tableDataList.${scope.rowIndex}.quantities`" :rules="checkRules.amountCheck"
-                  v-if="scope.rowIndex != '0' && addActualCostEditStatus" class="inner-edit-input-item">
+                  v-if="rowCanEditInput(scope.rowIndex,hasTarget) && addActualCostEditStatus" class="inner-edit-input-item">
                   <el-input placeholder="请输入" v-model="scope.row.quantities" clearable @input="v => statisticsSum(v,'quantities')"></el-input>
                 </el-form-item>
               </template>
@@ -58,7 +58,7 @@
               <template slot="purchaseUnitPrice" slot-scope="scope">
                 <!-- 编辑单元格 -->
                 <el-form-item :prop="`tableDataList.${scope.rowIndex}.purchaseUnitPrice`" :rules="checkRules.amountCheck"
-                  v-if="scope.rowIndex != '0' && addActualCostEditStatus" class="inner-edit-input-item">
+                  v-if="rowCanEditInput(scope.rowIndex,hasTarget) && addActualCostEditStatus" class="inner-edit-input-item">
                   <el-input placeholder="请输入" v-model="scope.row.purchaseUnitPrice" clearable
                     @input="v => statisticsSum(v,'purchaseUnitPrice')"></el-input>
                 </el-form-item>
@@ -605,6 +605,11 @@ export default {
       }, 0);
       return sum;
     },
+    // 当前是否可编辑
+    rowCanEditInput(index, hasTarget) {
+      // 不为id 0 或 不是劳务分包跟专业分包
+      return index != 0 || !hasTarget;
+    },
     // 保存
     saveActualCost() {
       this.$refs["feedSummaryForm"].validate(async flag => {