@nstc-business/imes 1.0.18 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstc-business/imes",
-  "version": "1.0.18",
+  "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)
                 }