Merge branch 'master' into 'master'

指标手动计算结果

See merge request lighter/vue-intergration-platform!130

src/views/target-management/target-dict/TargetDictConfig.vue

@@ -241,17 +241,17 @@
                     </el-col>
                     <el-col :span="6">
                       <el-form-item :label="'分子结果' + e" :prop="'childResult' + e">
-                        <el-input v-model="sqlForm['childResult' + e]" minlength="1" maxlength="12" show-word-limit />
+                        <el-input v-model="sqlForm['childResult' + e]" minlength="1" maxlength="12" show-word-limit  @change="reportResultFormat(e)"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
                       <el-form-item :label="'分母结果' + e" :prop="'momResult' + e">
-                        <el-input v-model="sqlForm['momResult' + e]" minlength="1" maxlength="12" show-word-limit />
+                        <el-input v-model="sqlForm['momResult' + e]" minlength="1" maxlength="12" show-word-limit @change="reportResultFormat(e)"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
                       <el-form-item :label="'分子/分母-结果' + e" :prop="'calcResult' + e">
-                        <el-input v-model="sqlForm['calcResult' + e]" minlength="1" maxlength="12" show-word-limit />
+                        <el-input v-model="sqlForm['calcResult' + e]" minlength="1" maxlength="16" show-word-limit/>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1074,6 +1074,17 @@ const bigOrSmall = () => {
     isShowTss.value = true
   }
 }
+// 手工数据填写计算结果
+const reportResultFormat = (e) => {
+  let child = sqlForm['childResult' + e]
+  let mom = sqlForm['momResult' + e]
+  if(child && mom && mom != '0'){
+    let result = (child/mom).toFixed(4)
+    if(result && result != 'NaN'){
+      sqlForm['calcResult' + e] = result
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 :deep(.hd-cl) {