@nstc-business/imes 1.0.17 → 1.0.19

package/package.json

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

package/src/components/calculateDetail/index.vue

@@ -351,9 +351,11 @@
             </vxe-column>
           </table-pro>
         </div>
+        <!-- 子模型：按模型树文件夹顺序（定量→定性→调整项）展开，不按类型分块 -->
+        <template v-for="(item, index) in typeObj.orderedSubModels">
         <!-- 评价模型 -->
         <div
-          v-for="(item, index) in typeObj.assessModelArray"
+          v-if="item._subModelKind === 'assess'"
           :key="'assessModelArray' + index"
           class="m-t-m"
         >
@@ -580,7 +582,7 @@
         </div>
         <!-- 计算模型 -->
         <div
-          v-for="(item, index) in typeObj.evalModelArray"
+          v-else-if="item._subModelKind === 'eval'"
           :key="'evalModelArray' + index"
           class="m-t-m"
         >
@@ -797,7 +799,7 @@
 
         <!--  统计模型 (暂不考虑子模型的情况) -->
         <div
-          v-for="(item, index) in typeObj.statisticsArray"
+          v-else-if="item._subModelKind === 'stat'"
           :key="'statisticsArray' + index"
           class="m-t-m"
         >
@@ -999,6 +1001,7 @@
             </table-pro>
           </div>
         </div>
+        </template>
       </div>
     </expandable-pane>
   </Page>
@@ -1083,7 +1086,9 @@ export default {
         // 计算模型数组
         evalModelArray: [],
         // 评价模型数组
-        assessModelArray: []
+        assessModelArray: [],
+        // 子模型按模型树文件夹顺序（定量→定性→调整项）展开
+        orderedSubModels: []
       },
       tabelHeadersAssessModel: [
         {
@@ -1402,6 +1407,7 @@ export default {
             this.processingData(this.model, 'targetArray')
             await this.queryCalcResultDetail()
             this.processingData(this.modelData)
+            this.alignSubModelsWithTargetOrder()
             this.comFn(this.modelData)
           }
           break
@@ -1414,7 +1420,9 @@ export default {
           modelTreeVO.itemID = modelTreeVO.modelID
           modelTreeVO.tableData = []
           modelTreeVO.children = []
-          this.typeObj.statisticsArray.push({...modelTreeVO})
+          const statRow = {...modelTreeVO, _subModelKind: 'stat'}
+          this.typeObj.statisticsArray.push(statRow)
+          this.typeObj.orderedSubModels.push(statRow)
           this.comFn(this.modelData)
           let showFullScore = 0
           let showIndicatorValText = 0
@@ -1706,6 +1714,21 @@ export default {
     // 统计模型table : isLeaf=2 itemType = 13
     // 计算模型table : isLeaf=0 itemType = 11
     // 评价模型table: isLeaf=0 itemType = 12
+    /** 子模型展开顺序与主表指标（定量→定性→调整项）保持一致 */
+    alignSubModelsWithTargetOrder() {
+      const orderIds = this.typeObj.targetArray
+        .filter(i => [11, 12, 13].includes(Number(i.itemType)))
+        .map(i => i.itemID)
+      if (!orderIds.length || !this.typeObj.orderedSubModels.length) {
+        return
+      }
+      this.typeObj.orderedSubModels.sort((a, b) => {
+        const ia = orderIds.indexOf(a.itemID)
+        const ib = orderIds.indexOf(b.itemID)
+        return (ia < 0 ? Number.MAX_SAFE_INTEGER : ia) -
+          (ib < 0 ? Number.MAX_SAFE_INTEGER : ib)
+      })
+    },
     processingData(modelData, type) {
       const modelTreeVO = JSON.parse(JSON.stringify(modelData.modelTreeVO))
       const digui = data => {
@@ -1750,7 +1773,9 @@ export default {
                   } else {
                     item.children = []
                     item.tableData = []
-                    this.typeObj.evalModelArray.push({...item})
+                    const row = {...item, _subModelKind: 'eval'}
+                    this.typeObj.evalModelArray.push(row)
+                    this.typeObj.orderedSubModels.push(row)
                   }
                 }
                   break
@@ -1766,7 +1791,9 @@ export default {
                   } else {
                     item.children = []
                     item.tableData = []
-                    this.typeObj.assessModelArray.push({...item})
+                    const row = {...item, _subModelKind: 'assess'}
+                    this.typeObj.assessModelArray.push(row)
+                    this.typeObj.orderedSubModels.push(row)
                   }
                 }
 
@@ -1783,7 +1810,9 @@ export default {
                   } else {
                     item.children = []
                     item.tableData = []
-                    this.typeObj.statisticsArray.push({...item})
+                    const row = {...item, _subModelKind: 'stat'}
+                    this.typeObj.statisticsArray.push(row)
+                    this.typeObj.orderedSubModels.push(row)
                   }
                   // this.typeObj.targetArray[this.typeObj.targetArray.length - 1] = await this.itemDataFn(item, data)
                 }

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;