@nstc-business/imes 1.0.20 → 1.0.22

package/package.json

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

package/src/components/calculateDetail/index.vue

@@ -101,8 +101,20 @@
           label-width="10em"
           v-if="modelData.sataMode !== 1"
         >
-          <el-form-item label="模型得分：" v-if="modelData.type === 1">
-            <span>{{ modelData.result.toFixed(modelData.digits) }}</span>
+          <el-form-item
+            label="模型得分："
+            v-if="
+              modelData.type === 1 ||
+                (modelData.type === 3 && modelData.sataMode === 2)
+            "
+          >
+            <span>
+              {{
+                modelData.result || modelData.result === 0
+                  ? Number(modelData.result).toFixed(modelData.digits)
+                  : '--'
+              }}
+            </span>
           </el-form-item>
           <el-form-item label="模型结果：" v-if="modelData.type !== 3">
             <span>{{ modelData.resultText }}</span>

package/src/components/measureCalc/MeasureEvalFlatTable.vue

@@ -57,6 +57,25 @@
         <template #default="{ row }">{{ fullScoreFn(row) }}</template>
       </vxe-column>
 
+      <vxe-column
+        v-if="showFormulaCol"
+        field="displayFormula"
+        title="计算公式"
+        width="130"
+        align="center"
+      >
+        <template #default="{ row }">{{ row.displayFormula || '—' }}</template>
+      </vxe-column>
+      <vxe-column
+        v-if="showRemarkCol"
+        field="indicatorRemark"
+        title="评价标准"
+        width="130"
+        align="center"
+      >
+        <template #default="{ row }">{{ row.indicatorRemark || '—' }}</template>
+      </vxe-column>
+
       <vxe-column title="指标值" min-width="260" align="center">
         <template #default="{ row }">
           <template v-if="isQualFn(row)">
@@ -119,6 +138,11 @@
       </vxe-column>
 
       <vxe-column title="指标得分" width="140" align="center">
+        <template #default="{ row }">
+          <div>{{ indicatorScoreFn(row) }}</div>
+        </template>
+      </vxe-column>
+      <vxe-column title="模型指标得分" width="140" align="center">
         <template #default="{ row }">
           <div>{{ resultFn(row) }}</div>
           <InputNumber
@@ -133,28 +157,10 @@
             :max="row.fullScore"
             :disabled="ctx.readonly"
             v-model="row.modifiedResult"
-            placeholder="修改指标得分"
+            placeholder="修改模型指标得分"
           />
         </template>
       </vxe-column>
-      <vxe-column
-        v-if="showFormulaCol"
-        field="displayFormula"
-        title="计算公式"
-        width="130"
-        align="center"
-      >
-        <template #default="{ row }">{{ row.displayFormula || '—' }}</template>
-      </vxe-column>
-      <vxe-column
-        v-if="showRemarkCol"
-        field="indicatorRemark"
-        title="评价标准"
-        width="130"
-        align="center"
-      >
-        <template #default="{ row }">{{ row.indicatorRemark || '—' }}</template>
-      </vxe-column>
       <vxe-column
         v-if="showModifyReasonCol"
         min-width="260"
@@ -218,6 +224,7 @@ import {
   isQualIndicator,
   digitsCalc,
   resultByShowStyle,
+  indicatorScoreText,
   indicatorResultText,
   fullScoreText,
   showLevelSerial
@@ -278,6 +285,9 @@ export default {
     resultFn(row) {
       return resultByShowStyle(row, this.ctx.modelWrap)
     },
+    indicatorScoreFn(row) {
+      return indicatorScoreText(row, this.ctx.modelWrap)
+    },
     indicatorTextFn(row) {
       return indicatorResultText(row, this.ctx.modelWrap)
     },

package/src/components/measureCalc/MeasureGroupBlocks.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="measure-group-blocks">
+    <measure-qual-analysis
+      v-if="qualLooseNodes.length"
+      :groups="qualLooseGroups"
+    />
+    <measure-tree-table
+      v-if="tableLooseNodes.length"
+      :nodes="tableLooseNodes"
+      :level="level"
+      :number-prefix="numberPrefix"
+      :calc-mode="calcMode"
+      :section="section"
+    />
+
+    <div
+      v-for="(group, i) in nestedGroups"
+      :key="group._rowKey || i"
+      class="measure-inner-group"
+    >
+      <div class="section-title">
+        {{ group.name }}
+        <span v-if="group.remark" class="section-remark">
+          备注：<span class="remark-html" v-html="group.remark"></span>
+        </span>
+        <span v-if="innerWeightText(group)" class="section-weight-pill">
+          {{ innerWeightText(group) }}
+        </span>
+        <span v-if="innerSubtotalText(group)" class="section-score-pill">
+          {{ innerSubtotalText(group) }}
+        </span>
+      </div>
+      <measure-group-blocks
+        :nodes="group.children || []"
+        :group-node="group"
+        :level="level + 1"
+        :number-prefix="childNumberPrefix(group)"
+        :calc-mode="calcMode"
+        :section="section"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import MeasureQualAnalysis from './MeasureQualAnalysis.vue'
+import {
+  splitGroupNodes,
+  isQualIndicator,
+  hierarchySerial,
+  hierarchySerialPrefix
+} from './helpers'
+
+export default {
+  name: 'MeasureGroupBlocks',
+  components: {
+    MeasureQualAnalysis,
+    MeasureTreeTable: () => import('./MeasureTreeTable.vue')
+  },
+  inject: ['measureCtx'],
+  props: {
+    nodes: {
+      type: Array,
+      default: () => []
+    },
+    groupNode: {
+      type: Object,
+      default: null
+    },
+    level: {
+      type: Number,
+      default: 1
+    },
+    numberPrefix: {
+      type: String,
+      default: ''
+    },
+    calcMode: {
+      type: Boolean,
+      default: false
+    },
+    section: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  computed: {
+    ctx() {
+      return this.measureCtx()
+    },
+    split() {
+      return splitGroupNodes(this.nodes)
+    },
+    nestedGroups() {
+      return this.split.groups
+    },
+    looseNodes() {
+      return this.split.loose
+    },
+    qualLooseNodes() {
+      return this.looseNodes.filter(isQualIndicator)
+    },
+    tableLooseNodes() {
+      return this.looseNodes.filter(n => !isQualIndicator(n))
+    },
+    qualLooseGroups() {
+      const resolve = this.ctx.resolveLeafNode
+      return [
+        {
+          name: '',
+          children: this.qualLooseNodes.map(n =>
+            resolve ? resolve(n) || n : n
+          )
+        }
+      ]
+    }
+  },
+  methods: {
+    innerWeightText(group) {
+      const fn = this.ctx.groupWeightText
+      return fn ? fn(group) : ''
+    },
+    innerSubtotalText(group) {
+      const fn = this.ctx.groupSubtotalText
+      return fn ? fn(group) : ''
+    },
+    childNumberPrefix(group) {
+      const idx = this.nodes.findIndex(n => n._rowKey === group._rowKey)
+      const serial = hierarchySerial(this.numberPrefix, idx < 0 ? 0 : idx)
+      return hierarchySerialPrefix(serial)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.measure-group-blocks {
+  width: 100%;
+}
+.measure-inner-group {
+  margin-top: 12px;
+}
+.measure-inner-group + .measure-inner-group {
+  margin-top: 16px;
+}
+.section-title {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  font-size: 15px;
+  font-weight: 600;
+  padding-left: 8px;
+  margin-bottom: 8px;
+  border-left: 3px solid #409eff;
+}
+.section-weight-pill,
+.section-score-pill {
+  display: inline-block;
+  margin-left: 4px;
+  padding: 2px 10px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #606266;
+  line-height: 20px;
+  background: #f2f3f5;
+  border-radius: 4px;
+}
+.section-remark {
+  margin-left: 0;
+  font-weight: 400;
+  color: #909399;
+}
+.section-remark .remark-html {
+  display: inline;
+  ::v-deep p {
+    display: inline;
+    margin: 0;
+  }
+}
+</style>

package/src/components/measureCalc/MeasureQualAnalysis.vue

@@ -22,92 +22,120 @@
         </span>
       </div>
 
-      <div class="qual-table">
-        <template v-for="(node, i) in group.children">
-          <!-- 不可量化：下拉选项 -->
-          <div
-            v-if="isQualSelectNode(node)"
-            :key="'qual-' + (node._rowKey || i)"
-            class="qual-row"
-          >
-            <div class="qual-cell qual-cell-name" v-title="node.name">
-              {{ node.name }}
-            </div>
-            <div class="qual-cell qual-cell-select">
-              <el-select
-                class="qual-select"
-                :value="node.scoreMapID"
-                :disabled="readonly"
-                size="small"
-                placeholder="请选择"
-                @change="val => onSelectChange(node, val)"
+      <vxe-table
+        border
+        class="qual-table"
+        :data="group.children"
+        :row-config="{ keyField: '_rowKey' }"
+        :scroll-y="{ enabled: false }"
+      >
+        <vxe-column v-if="showSerial" title="序号" width="72" align="center">
+          <template #default="{ rowIndex }">{{ rowIndex + 1 }}</template>
+        </vxe-column>
+
+        <vxe-column field="name" title="指标名称" min-width="180" align="center">
+          <template #default="{ row }">
+            <span v-title="row.name">{{ row.name }}</span>
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          v-if="showWeightCol"
+          title="指标权重"
+          width="100"
+          align="center"
+        >
+          <template #default="{ row }">{{ row.weight || '—' }}</template>
+        </vxe-column>
+
+        <vxe-column title="指标满分值" width="110" align="center">
+          <template #default="{ row }">{{ formatFullScore(row) }}</template>
+        </vxe-column>
+
+        <vxe-column title="评价标准" min-width="180" align="center">
+          <template #default="{ row }">{{ evalStandardText(row) }}</template>
+        </vxe-column>
+
+        <vxe-column title="指标值" min-width="220" align="center">
+          <template #default="{ row }">
+            <el-select
+              v-if="isQualSelectNode(row)"
+              class="qual-select"
+              :value="row.scoreMapID"
+              :disabled="readonly"
+              size="small"
+              placeholder="请选择"
+              @change="val => onSelectChange(row, val)"
+            >
+              <el-option
+                v-for="option in row.optionList"
+                :key="option.scoreMapID"
+                :label="option.scoreText"
+                :value="option.scoreMapID"
+                style="height: auto"
               >
-                <el-option
-                  v-for="option in node.optionList"
-                  :key="option.scoreMapID"
-                  :label="option.scoreText"
-                  :value="option.scoreMapID"
-                  style="height: auto"
-                >
-                  <div class="select-top">{{ option.scoreText }}</div>
-                  <div class="select-bottom">{{ option.reason }}</div>
-                </el-option>
-              </el-select>
-              <div class="option-reason">{{ selectedOptionReason(node) }}</div>
-            </div>
-            <div class="qual-cell qual-cell-score">
-              <span class="qual-inline-label">
-                {{ scoreLabel(group, node) }}
-              </span>
-              <span class="qual-score-value">
-                {{ formatScore(node.result) }}
-              </span>
-            </div>
-            <div class="qual-cell qual-cell-reason">
-              <span class="qual-inline-label">评价理由</span>
-              <el-input
-                class="qual-reason-input"
-                type="textarea"
-                v-title
-                :show-overflow-tooltip="true"
-                :maxlength="2000"
-                show-word-limit
-                v-model="node.reason"
-                :disabled="readonly"
-                placeholder="请输入具体评价依据，不超过2000字"
-                @input="onReasonInput(node)"
-              />
-            </div>
-          </div>
+                <div class="select-top">{{ option.scoreText }}</div>
+                <div class="select-bottom">{{ option.reason }}</div>
+              </el-option>
+            </el-select>
+            <el-input
+              v-else-if="row.sourceType === 3"
+              class="qual-manual-input"
+              type="number"
+              size="small"
+              v-model="row.scoreValue"
+              :disabled="readonly"
+              placeholder="请输入评分"
+            />
+            <span v-else>—</span>
+          </template>
+        </vxe-column>
 
-          <!-- 手工填报 -->
-          <div
-            v-else-if="node.sourceType === 3"
-            :key="'manual-' + (node._rowKey || i)"
-            class="qual-row"
-          >
-            <div class="qual-cell qual-cell-name" v-title="node.name">
-              {{ node.name }}
-            </div>
-            <div class="qual-cell qual-cell-manual">
-              <el-input
-                class="qual-manual-input"
-                type="number"
-                size="small"
-                v-model="node.scoreValue"
-                :disabled="readonly"
-                placeholder="请输入评分"
-              />
-            </div>
-          </div>
-        </template>
-      </div>
+        <vxe-column :title="scoreColTitle(group)" width="120" align="center">
+          <template #default="{ row }">
+            {{ formatIndicatorScore(group, row) }}
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          v-if="showModelScoreCol"
+          title="模型指标得分"
+          width="130"
+          align="center"
+        >
+          <template #default="{ row }">{{ formatScore(row.result) }}</template>
+        </vxe-column>
+
+        <vxe-column title="评价理由" min-width="240" align="center">
+          <template #default="{ row }">
+            <el-input
+              v-if="isQualSelectNode(row)"
+              class="qual-reason-input"
+              type="textarea"
+              v-title
+              :show-overflow-tooltip="true"
+              :maxlength="2000"
+              show-word-limit
+              v-model="row.reason"
+              :disabled="readonly"
+              placeholder="请输入具体评价依据，不超过2000字"
+              @input="onReasonInput(row)"
+            />
+          </template>
+        </vxe-column>
+      </vxe-table>
     </div>
   </div>
 </template>
 
 <script>
-import { resultByShowStyle, showLevelSerial, isQualIndicator } from './helpers'
+import {
+  resultByShowStyle,
+  indicatorScoreText,
+  showLevelSerial,
+  isQualIndicator,
+  fullScoreText
+} from './helpers'
 
 export default {
   name: 'MeasureQualAnalysis',
@@ -128,6 +156,12 @@ export default {
     showSerial() {
       return showLevelSerial(this.modelWrap)
     },
+    showWeightCol() {
+      return this.modelWrap.showWeight === 1 && !this.measureCtx().calcMode
+    },
+    showModelScoreCol() {
+      return !this.measureCtx().calcMode
+    },
     /** 始终绑定 leafList 原始节点，避免 vxe 展开区副本导致 v-model 丢失 */
     displayGroups() {
       const resolve = this.measureCtx().resolveLeafNode
@@ -156,16 +190,26 @@ export default {
         (isQualIndicator(node) && node.optionList && node.optionList.length)
       )
     },
-    scoreLabel(group, node) {
+    scoreColTitle(group) {
+      if (group.itemType === 11) return '系数值'
+      return '指标得分'
+    },
+    formatIndicatorScore(group, node) {
       if (group.itemType === 11) {
-        return node.ratioName ? `${node.ratioName}系数值` : '系数值'
+        return this.formatScore(node.result)
       }
-      return '得分'
+      return indicatorScoreText(node, this.modelWrap)
     },
     formatScore(val) {
       if (val === '' || val == null) return ''
       return resultByShowStyle({ result: val }, this.modelWrap)
     },
+    formatFullScore(node) {
+      return fullScoreText(node, this.modelWrap) || '—'
+    },
+    evalStandardText(node) {
+      return node.indicatorRemark || this.selectedOptionReason(node) || '—'
+    },
     resolveNode(node) {
       const resolve = this.measureCtx().resolveLeafNode
       return resolve ? resolve(node) || node : node
@@ -293,105 +337,14 @@ export default {
 
 .qual-table {
   width: 100%;
-  border: 1px solid #ebeef5;
-  border-radius: 2px;
-  overflow: hidden;
-}
-
-.qual-row {
-  display: flex;
-  width: 100%;
-  min-height: 52px;
-  border-bottom: 1px solid #ebeef5;
-  box-sizing: border-box;
-
-  &:last-child {
-    border-bottom: none;
-  }
-}
-
-.qual-cell {
-  padding: 10px 12px;
-  border-right: 1px solid #ebeef5;
-  box-sizing: border-box;
-  min-width: 0;
-  font-size: 14px;
-  color: #303133;
-  line-height: 1.5;
-
-  &:last-child {
-    border-right: none;
-  }
-}
-
-/* 指标名称 | 选项 | 得分 | 评价理由 */
-.qual-cell-name {
-  flex: 0 0 16%;
-  background: #fafafa;
-  color: #606266;
-  display: flex;
-  align-items: center;
-  word-break: break-all;
-}
-
-.qual-cell-select {
-  flex: 0 0 28%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.qual-cell-score {
-  flex: 0 0 12%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  gap: 4px;
-}
-
-.qual-cell-reason {
-  flex: 0 0 44%;
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-}
-
-.qual-cell-manual {
-  flex: 1;
-  display: flex;
-  align-items: center;
-}
-
-.qual-inline-label {
-  flex-shrink: 0;
-  font-size: 14px;
-  color: #606266;
-  line-height: 1.4;
-}
-
-.qual-score-value {
-  min-height: 20px;
-  word-break: break-all;
 }
 
+.qual-select,
 .qual-reason-input,
 .qual-manual-input {
   width: 100%;
 }
 
-.qual-select {
-  width: 100%;
-}
-
-.option-reason {
-  margin-top: 4px;
-  color: #999;
-  font-size: 14px;
-  line-height: 1.4;
-  white-space: normal;
-  word-wrap: break-word;
-}
-
 .select-top {
   margin-top: 2px;
   height: 14px;
@@ -409,7 +362,15 @@ export default {
   white-space: normal;
   word-wrap: break-word;
 }
+
 /deep/ .el-select .el-input__inner {
   text-align: center;
 }
+
+/deep/ .vxe-body--column {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  height: auto !important;
+  max-height: unset !important;
+}
 </style>

package/src/components/measureCalc/MeasureStatCell.vue

@@ -79,7 +79,8 @@ export default {
   methods: {
     displayValue(cell) {
       if (this.column.disabled) {
-        const val = cell.result
+        const val =
+          cell.result !== '' && cell.result != null ? cell.result : cell.value
         if (val === '' || val == null) return ''
         let text = Number(val).toFixed(this.digits)
         if (cell.showStyle === 2) {