@nstc-business/imes 1.0.3 → 1.0.4

package/package.json

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

package/src/components/model-calculate/modelCalcTest.vue

@@ -169,7 +169,7 @@
         模型类型：{{ item.itemType == 11 ? '计算模型' : '评价模型' }}
       </span>
       <div class="m-t-s">
-        <n20-table-pro
+        <table-pro
           border
           :columns="tabelHeadersEvalModel"
           :data="item.tableData"
@@ -308,7 +308,7 @@
               ></input-number>
             </template>
           </vxe-column>
-        </n20-table-pro>
+        </table-pro>
       </div>
     </div>
 
@@ -321,7 +321,7 @@
       <span>模型名称：{{ item.name }}</span>
       <span class="m-l-s">模型类型：{{ '统计模型' }}</span>
       <div class="m-t-s">
-        <n20-table-pro
+        <table-pro
           border
           :columns="tabelHeadersStatistics"
           :data="item.tableData"
@@ -462,14 +462,13 @@
               ></input-number>
             </template>
           </vxe-column>
-        </n20-table-pro>
+        </table-pro>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-// import { getModelById, qryModelBkIndicatorList, testCalc } from '../../api/modelIndex'
 /**
  * 关键参数说明 sourceType
  * 0 系统自定义
@@ -521,8 +520,18 @@ import {TablePro, InputNumber} from 'n20-common-lib'
 
 export default {
   name: 'modelCalcTest',
-  props: ['modelId', 'modelCode', 'modelData'],
+  props: ['modelId', 'modelCode', 'modelData', 'apiPrefix'],
   components: {inputNumber2, TablePro, InputNumber},
+  watch: {
+    modelCode: {
+      handler(val) {
+        if (val) {
+          this.init()
+        }
+      },
+      immediate: true
+    }
+  },
   data() {
     return {
       toFixedTrunc,
@@ -531,7 +540,6 @@ export default {
         cltNo: '',
         calcDate: ''
       },
-
       // 拆分数结构为三类数据
       typeObj: {
         // 指标数组
@@ -541,7 +549,6 @@ export default {
         // 评价/计算模型数组
         evalModelArray: []
       },
-
       tabelHeadersTarget: [
         {
           label: '分组',
@@ -588,7 +595,6 @@ export default {
           'show-overflow-tooltip': false
         }
       ],
-
       tabelHeadersEvalModel: [
         // {
         //   label: '序号',
@@ -628,7 +634,6 @@ export default {
           'show-overflow-tooltip': false
         }
       ],
-
       tabelHeadersStatistics: [
         {
           label: '指标项',
@@ -675,16 +680,47 @@ export default {
           'show-overflow-tooltip': false
         }
       ],
-
       messageStr: '',
       key: 0
     }
   },
   methods: {
+    init() {
+      this.typeObj = {
+        // 指标数组
+        targetArray: [],
+        // 统计模型数组
+        statisticsArray: [],
+        // 评价/计算模型数组
+        evalModelArray: []
+      }
+      switch (this.modelData.type) {
+        case 1:
+        case 2:
+          if (this.modelCode) {
+            this.processingData(this.modelData)
+            this.getModelWithChildren(this.modelCode)
+          }
+          break
+        case 3:
+          const modelTreeVO = JSON.parse(
+            JSON.stringify(this.modelData.modelTreeVO)
+          )
+          modelTreeVO.itemID = modelTreeVO.modelID
+          modelTreeVO.tableData = []
+          modelTreeVO.children = []
+          this.typeObj.statisticsArray.push({...modelTreeVO})
+          this.comFn(this.modelData)
+          break
+        default:
+          break
+      }
+    },
     /** 获取模型下面的内容 */
     async getModelWithChildren(modelCode) {
-      const {code, data} = await this.$axios.post(
-        '/imes/v1/indicatorModel/getModelByCodeWithChildren',
+      const {code, data} = await this.$axios.post(this.apiPrefix
+          ? `${this.apiPrefix}/imes/v1/indicatorModel/getModelByCodeWithChildren`
+          : '/imes/v1/indicatorModel/getModelByCodeWithChildren',
         {id: modelCode}
       )
       if (code == 0) {
@@ -836,7 +872,9 @@ export default {
         // 组合时间戳和随机数
         const randomNumStr = `${timestamp}${randomNum}`
         const {code, data: optionList} = await this.$axios.post(
-          `/imes/v1/indicator/getScoreMap?randomNumStr=${randomNumStr}`,
+          this.apiPrefix
+            ? `${this.apiPrefix}/imes/v1/indicator/getScoreMap?randomNumStr=${randomNumStr}`
+            : `/imes/v1/indicator/getScoreMap?randomNumStr=${randomNumStr}`,
           {id: item.itemID}
         )
         if (code == 0) {
@@ -871,7 +909,9 @@ export default {
       // 统计模型单独写测算
       if (this.modelData.type == 3) {
         try {
-          res = await this.$axios.post('/imes/v2/models/testCalc', this.param)
+          res = await this.$axios.post(this.apiPrefix
+            ? `${this.apiPrefix}/imes/v2/models/testCalc`
+            : '/imes/v2/models/testCalc', this.param)
         } catch (error) {
           this.$emit('changeLoading', false)
         }
@@ -885,7 +925,9 @@ export default {
       } else {
         try {
           res = await this.$axios.post(
-            '/imes/v2/models/calcWithChildren',
+            this.apiPrefix
+              ? `${this.apiPrefix}/imes/v2/models/calcWithChildren`
+              : '/imes/v2/models/calcWithChildren',
             this.param
           )
         } catch (error) {
@@ -1173,33 +1215,6 @@ export default {
       }
       return value + displayStyle
     }
-  },
-  mounted() {
-    // if (this.modelData.showLevel !== 1) {
-    //   this.tabelHeadersTarget = this.tabelHeadersTarget.filter(item => item.prop !== 'serialNumber')
-    //   this.tabelHeadersEvalModel = this.tabelHeadersEvalModel.filter(item => item.prop !== 'serialNumber')
-    // }
-    switch (this.modelData.type) {
-      case 1:
-      case 2:
-        if (this.modelCode) {
-          this.processingData(this.modelData)
-          this.getModelWithChildren(this.modelCode)
-        }
-        break
-      case 3:
-        const modelTreeVO = JSON.parse(
-          JSON.stringify(this.modelData.modelTreeVO)
-        )
-        modelTreeVO.itemID = modelTreeVO.modelID
-        modelTreeVO.tableData = []
-        modelTreeVO.children = []
-        this.typeObj.statisticsArray.push({...modelTreeVO})
-        this.comFn(this.modelData)
-        break
-      default:
-        break
-    }
   }
 }
 </script>

package/src/components/model-calculate/tree.vue

@@ -14,9 +14,9 @@
         v-title
         slot-scope="{ node, data }"
       >
-        <i :class="data.type == 0 ? 'el-icon-folder' : 'el-icon-tickets'" />
+        <i :class="data.type == 0 ? 'el-icon-folder' : 'el-icon-tickets'"/>
         <div class="custom-tree-label" v-title:tooltip>
-          {{ data.label}}
+          {{ data.label }}
         </div>
       </div>
     </el-tree>
@@ -27,9 +27,9 @@
 export default {
   name: 'Tree',
   props: {
-    flag: {
-      type: Boolean,
-      default: true
+    type: {
+      type: Number,
+      default: 1
     },
     modelTree: {
       type: [Array, Object],
@@ -39,9 +39,6 @@ export default {
   computed: {
     treeVal: {
       get() {
-        if (!this.flag) {
-          return this.modelTree?.map(item => this.buildTreeItem(item)) || []
-        }
         return Array.isArray(this.modelTree)
           ? this.modelTree.map(item => this.buildModelTreeItem(item))
           : [this.buildModelTreeItem(this.modelTree)]

package/src/components/model-calculate.vue

@@ -1,5 +1,5 @@
 <template>
-  <page>
+  <Page>
     <template slot="header">
       <expandable-pane title="模型信息">
         <descriptions>
@@ -17,9 +17,9 @@
     </template>
     <expandable-pane title="模型指标">
       <div class="flex-box">
-        <tree disable :modelTree="model.modelTreeVO"/>
+        <tree :modelTree="treeData"/>
         <modelCalcTest
-          v-if="(model.type === 1 || model.type === 2) && model.code"
+          v-if="model.code"
           class="m-l-xl flex-item overflow"
           ref="calcTable"
           @changeLoading="changeLoading"
@@ -31,11 +31,10 @@
       </div>
     </expandable-pane>
     <div slot="footer">
-      <expandable-pane title="模型结果">
+      <expandable-pane title="模型结果" v-if="model.type !== 3">
         <div>测算结果：{{ model.showStyle === 2 ? addThousands(result) : result }}</div>
       </expandable-pane>
       <div class="flex-box flex-c flex-v">
-        <el-button plain @click="back">返回</el-button>
         <el-button
           type="primary"
           size="small"
@@ -46,7 +45,7 @@
         </el-button>
       </div>
     </div>
-  </page>
+  </Page>
 </template>
 
 <script>
@@ -56,7 +55,11 @@ import modelCalcTest from './model-calculate/modelCalcTest.vue'
 
 export default {
   props: {
-    modelId: String
+    modelId: String,
+    apiPrefix: {
+      type: String,
+      default: undefined
+    }
   },
   watch: {
     modelId: {
@@ -77,10 +80,10 @@ export default {
   },
   data() {
     return {
-      indicatorList: [],
       model: {type: 1, name: ''},
       result: '',
-      loading: false
+      loading: false,
+      treeData: {}
     }
   },
   methods: {
@@ -95,14 +98,16 @@ export default {
     },
     async getModelById() {
       if (!this.modelId) return
-      const {data, code} = await this.$axios.post('/imes/v1/indicatorModel/getModelById', {id: this.modelId})
+      const {data, code} = await this.$axios.post(this.apiPrefix
+        ? `${this.apiPrefix}/imes/v1/indicatorModel/getModelById`
+        : `/imes/v1/indicatorModel/getModelById`, {id: this.modelId})
       if (code === 0) {
         this.model = data
-        if (this.model.type == 3) {
-          this.$set(this, 'modelTreeVO', [this.model.modelTreeVO])
-          this.recursionFn(this.modelTreeVO)
+        if (this.model.type === 3) {
+          this.$set(this, 'treeData', [this.model.modelTreeVO])
+          this.recursionFn(this.treeData)
         } else {
-          this.recursionFn([this.model.modelTreeVO])
+          this.treeData = this.model.modelTreeVO
         }
       }
     },
@@ -131,9 +136,6 @@ export default {
     },
     calc() {
       this.$refs.calcTable.calc()
-    },
-    back() {
-      this.$router.go(-1)
     }
   }
 }

package/src/index.js

@@ -20,5 +20,5 @@ if (typeof window !== 'undefined' && window.Vue) {
 export default {
   version: '1.0.0',
   install,
-  CascaderArea,
+  ModelCalculate,
 }