@nstc-business/imes 1.0.16 → 1.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstc-business/imes",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/measureCalc/MeasureStatFlatTable.vue

@@ -5,6 +5,7 @@
       v-else
       border
       :data="rows"
+      :merge-cells="mergeCells"
       :row-config="{ keyField: '_rowKey' }"
       :scroll-y="{ enabled: false }"
     >
@@ -118,6 +119,7 @@
 
 <script>
 import { InputNumber } from './ui'
+import { setMergeCells } from '../common'
 import {
   isQualIndicator,
   digitsCalc,
@@ -125,6 +127,16 @@ import {
   indicatorResultText
 } from './helpers'
 
+/** 与表格列顺序一致，供 setMergeCells 计算列索引 */
+const STAT_FLAT_COLUMNS = [
+  { prop: 'pName' },
+  { prop: 'statsName' },
+  { prop: 'name' },
+  { prop: 'indicatorResult' },
+  { prop: 'result' },
+  { prop: 'indicatorValText' }
+]
+
 export default {
   name: 'MeasureStatFlatTable',
   components: { InputNumber },
@@ -138,6 +150,16 @@ export default {
   computed: {
     ctx() {
       return this.measureCtx()
+    },
+    /** 同目录（pid）下的「指标项」列合并，对齐旧版 modelCalcTest */
+    mergeCells() {
+      return setMergeCells({
+        list: this.rows,
+        columns: STAT_FLAT_COLUMNS,
+        merges: ['pName'],
+        condition: ['pid'],
+        field: 'prop'
+      })
     }
   },
   methods: {

package/src/components/measureCalc/index.vue

@@ -191,6 +191,12 @@
           <span v-if="section.remark" class="section-remark">
             备注：<span class="remark-html" v-html="section.remark"></span>
           </span>
+          <span
+            v-if="sectionWeightText(section)"
+            class="section-weight-pill"
+          >
+            {{ sectionWeightText(section) }}
+          </span>
           <span
             v-if="sectionScoreText(section)"
             class="section-score-pill"
@@ -644,11 +650,11 @@ export default {
       this.leafList = leafList
       this.qualList = qualList
       this.subModelList = subModelList
+      // 仅以模型级测算结果 / 日志为准；分组节点 result 默认 0 不能当作已测算
       this.parentCalced = !!(
         this.logId ||
         this.model.logId ||
-        (this.model.result !== '' && this.model.result != null) ||
-        (root.result !== '' && root.result != null)
+        (this.model.result !== '' && this.model.result != null)
       )
       this.qualSelectionDraft = {}
       this.resultText = this.model.resultText || root.resultText || ''
@@ -1309,11 +1315,74 @@ export default {
       return `总得分: ${totalText} = ${parts.join(' + ')}`
     },
 
-    /** 分区标题旁得分（评价模型测算后） */
+    /**
+     * 收集参与总权重计算的叶子：指标 / 子模型（文件夹只下钻，不参与）
+     * 公式：满分值 * 占模型权重%
+     */
+    collectWeightContributors(nodes, bucket = []) {
+      if (!Array.isArray(nodes)) return bucket
+      nodes.forEach(n => {
+        if (!n) return
+        if (this.isSubModel(n) || isIndicator(n)) {
+          if (
+            (n.fullScore === 0 || n.fullScore) &&
+            (n.weight === 0 || n.weight)
+          ) {
+            bucket.push(n)
+          }
+          return
+        }
+        if (n.children && n.children.length) {
+          this.collectWeightContributors(n.children, bucket)
+        }
+      })
+      return bucket
+    },
+
+    /**
+     * 大分组总权重文案：总权重: 75.00（不展示计算过程）
+     */
+    buildGroupWeightText(groupNode, children) {
+      if (!groupNode) return ''
+      const contributors = this.collectWeightContributors(
+        children || groupNode.children || []
+      )
+      let total = null
+      if (contributors.length) {
+        total = contributors.reduce((sum, n) => {
+          const full = Number(n.fullScore)
+          const weight = Number(n.weight)
+          return (
+            sum +
+            ((Number.isNaN(full) ? 0 : full) *
+              (Number.isNaN(weight) ? 0 : weight)) /
+              100
+          )
+        }, 0)
+      } else if (groupNode.fullScore === 0 || groupNode.fullScore) {
+        total = groupNode.fullScore
+      }
+      if (total === null) return ''
+      return `总权重: ${this.formatScoreNum(total)}`
+    },
+
+    /** 分区标题旁总权重（评价模型且开启显示权重） */
+    sectionWeightText(section) {
+      if (!this.evalRootModel || !section) return ''
+      if (this.model.showWeight !== 1) return ''
+      if (!section.container || this.isSubModel(section.container)) return ''
+      return this.buildGroupWeightText(section.container, section.nodes)
+    },
+
+    /** 分区标题旁得分（评价模型：未测算显示 --） */
     sectionScoreText(section) {
-      if (!this.evalRootModel || !this.parentCalced || !section) return ''
+      if (!this.evalRootModel || !section) return ''
       if (!section.container || this.isSubModel(section.container)) return ''
-      return this.buildGroupScoreText(section.container, section.nodes)
+      if (!this.parentCalced) return '总得分: --'
+      return (
+        this.buildGroupScoreText(section.container, section.nodes) ||
+        '总得分: --'
+      )
     },
 
     /**
@@ -1514,6 +1583,7 @@ export default {
   padding-left: 8px;
   border-left: 3px solid #409eff;
 }
+.section-weight-pill,
 .section-score-pill {
   display: inline-block;
   margin-left: 4px;

package/src/components/measureCalc/statModelHelper.js

@@ -287,9 +287,12 @@ export function collectStatFlatRows(modelWrap, statNode) {
   const rows = []
 
   const pushIndicators = (groupNode, pName) => {
+    const groupPid = groupNode.itemID || groupNode.tid || groupNode.pid
     statItemChildren(groupNode).forEach(ind => {
       if (ind.itemType == 21 || ind.itemType == 22 || ind.isLeaf == 1) {
         if (!ind.pName) ind.pName = pName
+        // 合并单元格按 pid 分组；缺省时回落到目录节点 id
+        if (ind.pid == null || ind.pid === '') ind.pid = groupPid
         rows.push(ind)
       }
     })