预测累计

 src/views/model/pre/item/MmPredictItemChart.vue

@@ -167,6 +167,37 @@
              },
            },
          })
          //累计点
          if(viewData.cumulantRealData) {
            legendData.push(key + "累计:" + '真实值')
            seriesData.push({
              name: key + "累计:" + '真实值',
              type: "line",
              data: viewData.cumulantRealData,
              showSymbol: false,
              smooth: false,
              lineStyle: {
                normal: {
                  width: 1,
                },
              },
            })
          }
          if(viewData.cumulantPreData) {
            legendData.push(key + "累计:" + '预测值')
            seriesData.push({
              name: key + "累计:" + '预测值',
              type: "line",
              data: viewData.cumulantPreData,
              showSymbol: false,
              smooth: false,
              lineStyle: {
                normal: {
                  width: 1,
                },
              },
            })
          }
        })
      }


 src/views/model/pre/item/MmPredictItemForm.vue

@@ -1,5 +1,5 @@
<template>
  <Dialog v-model="dialogVisible" :title="dialogTitle" width="60%">
  <Dialog v-model="dialogVisible" :title="dialogTitle" width="75%">
    <el-form
      ref="formRef"
      v-loading="formLoading"
@@ -77,44 +77,6 @@
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="是否累计" prop="mmPredictItem.iscumulant">
            <el-select v-model="dataForm.mmPredictItem.iscumulant" placeholder="请选择">
              <el-option
                v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="累计除数" prop="mmPredictItem.cumuldivisor">
            <el-input-number v-model="dataForm.mmPredictItem.cumuldivisor" style="width: 100%"
                             :min="1" :max="60"
                             :controls="false"/>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="累计测点">
            <el-select
              v-model="dataForm.mmPredictItem.cumulpoint"
              filterable
              clearable
              placeholder="请选择">
              <el-option
                v-for="item in pointList"
                :key="item.id"
                :label="item.pointName"
                :value="item.id"/>
            </el-select>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="管网" prop="dmModuleItem.moduleid">
            <el-select v-model="dataForm.dmModuleItem.moduleid" placeholder="请选择" @change="clearExpressionList">
              <el-option
@@ -139,30 +101,69 @@
          </el-form-item>
        </el-col>
      </el-row>
      <el-row v-if="dataForm.itemtypename === 'MergeItem'">
        <el-col :span="12">
          <el-form-item label="预测长度" prop="mmPredictItem.predictlength">
            <el-input
              v-model="dataForm.mmPredictItem.predictlength" placeholder="预测长度"
              maxlength="5"/>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="真实数据点">
            <el-select
              v-model="dataForm.pointId"
              filterable
              clearable
              placeholder="请选择">
              <el-option
                v-for="item in pointList"
                :key="item.id"
                :label="item.pointName"
                :value="item.id"/>
            </el-select>
          </el-form-item>
        </el-col>
      </el-row>
      <div v-if="dataForm.itemtypename === 'MergeItem'">
        <el-row>
          <el-col :span="12">
            <el-form-item label="预测长度" prop="mmPredictItem.predictlength">
              <el-input
                v-model="dataForm.mmPredictItem.predictlength" placeholder="预测长度"
                maxlength="5"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="真实数据点">
              <el-select
                v-model="dataForm.pointId"
                filterable
                clearable
                placeholder="请选择">
                <el-option
                  v-for="item in pointList"
                  :key="item.id"
                  :label="item.pointName"
                  :value="item.id"/>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-divider content-position="left">累计配置</el-divider>
        <el-row>
          <el-col :span="6">
            <el-form-item label="是否累计" prop="iscumulant">
              <el-select v-model="dataForm.iscumulant" placeholder="请选择" @change="(value) => iscumulantChange(dataForm)">
                <el-option
                  v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="累计除数" prop="cumuldivisor">
              <el-input-number v-model="dataForm.cumuldivisor" style="width: 100%" :disabled="dataForm.iscumulant !== 1"
                :min="1" :max="60"
                :controls="false"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="累计测点">
              <el-select
                v-model="dataForm.cumulpoint" :disabled="dataForm.iscumulant !== 1"
                filterable
                clearable
                placeholder="请选择">
                <el-option
                  v-for="item in pointList.filter(e => e.pointType === 'CUMULATE')"
                  :key="item.id"
                  :label="item.pointName"
                  :value="item.id"/>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
      </div>
      <el-divider content-position="left" v-if="dataForm.itemtypename === 'NormalItem'">模型信息
      </el-divider>
      <el-row :gutter="8" v-if="dataForm.itemtypename === 'NormalItem'">
@@ -306,6 +307,41 @@
              placeholder="请选择">
              <el-option
                v-for="item in pointList"
                :key="item.id"
                :label="item.pointName"
                :value="item.id"/>
            </el-select>
          </template>
        </el-table-column>
        <el-table-column label="是否累计" align="center" width="150px">
          <template #default="scope">
            <el-select v-model="scope.row.iscumulant" placeholder="请选择" @change="(value) => iscumulantChange(scope.row)">
              <el-option
                v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </template>
        </el-table-column>
        <el-table-column label="累计除数" align="center" width="100px">
          <template #default="scope">
            <el-input-number v-model="scope.row.cumuldivisor" style="width: 100%"
              :min="1" :max="60" :disabled="scope.row.iscumulant !== 1"
              :controls="false"/>
          </template>
        </el-table-column>
        <el-table-column label="累计数据点" align="center">
          <template #default="scope">
            <el-select
              v-model="scope.row.cumulpoint"
              :disabled="scope.row.iscumulant !== 1"
              filterable
              clearable
              placeholder="请选择">
              <el-option
                v-for="item in pointList.filter(e => e.pointType === 'CUMULATE')"
                :key="item.id"
                :label="item.pointName"
                :value="item.id"/>
@@ -557,9 +593,6 @@
    workchecked: 0,
    unittransfactor: undefined,
    saveindex: undefined,
    iscumulant: undefined,
    cumuldivisor: undefined,
    cumulpoint: undefined,
  },
  dmModuleItem: {
    id: undefined,
@@ -599,7 +632,10 @@
  },
  mmModelArithSettingsList: [],
  mmModelParamList: [],
  pointId: undefined
  pointId: undefined,
  iscumulant: 0,
  cumuldivisor: undefined,
  cumulpoint: undefined,
})
const formRules = reactive({
  'mmPredictItem.itemname': [{required: true, message: '预测项名不能为空', trigger: 'blur'}],
@@ -615,8 +651,7 @@
    trigger: 'blur'
  }],
  'mmPredictItem.status': [{required: true, message: '是否启用不能为空', trigger: 'blur'}],
  'mmPredictItem.iscumulant': [{required: true, message: '是否累计不能为空', trigger: 'blur'}],
  'mmPredictItem.cumuldivisor': [{required: true, message: '累计除数不能为空', trigger: 'blur'}],
  'iscumulant': [{required: true, message: '是否累计不能为空', trigger: 'blur'}],
  'dmModuleItem.moduleid': [{required: true, message: '管网不能为空', trigger: 'blur'}],
  'dmModuleItem.itemorder': [{required: true, message: '排序不能为空', trigger: 'blur'}],
  'mmPredictItem.predictlength': [{required: true, message: '预测长度不能为空', trigger: 'blur'}],
@@ -683,6 +718,13 @@
  if (!formRef) return
  const valid = await formRef.value.validate()
  if (!valid) return
  //校验累计配置
  if (dataForm.value.iscumulant === 1) {
    if (dataForm.value.cumuldivisor == undefined) {
      message.error("累计除数不为空")
      return
    }
  }
  //校验模型输出
  if (dataForm.value.itemtypename === 'NormalItem') {
    if (dataForm.value.mmItemOutputList == undefined || dataForm.value.mmItemOutputList.length <= 0) {
@@ -692,7 +734,10 @@

    let flag = false
    dataForm.value.mmItemOutputList.forEach(e => {
      if (e.resultstr == undefined || e.resultstr === '' || e.resultType == undefined || e.resultType === '' || (e.resultType === 2 && (e.resultIndex == undefined || e.resultIndex === ''))) {
      if (e.resultstr == undefined || e.resultstr === '' || e.resultType == undefined || e.resultType === ''
        || (e.resultType === 2 && (e.resultIndex == undefined || e.resultIndex === ''))
        || (e.iscumulant === 1 && e.cumuldivisor == undefined)
      ) {
        message.error("模型输出数据异常")
        flag = true
        return
@@ -940,6 +985,10 @@
    row.resultIndex = 0
  }
}
function iscumulantChange(row) {
  row.cumuldivisor = undefined
  row.cumulpoint = undefined
}

function orderRow(rows) {
  let modelparamorder = 0
@@ -1001,9 +1050,6 @@
      workchecked: 0,
      unittransfactor: '',
      saveindex: '',
      iscumulant: 0,
      cumuldivisor: 60,
      cumulpoint: '',
    },
    dmModuleItem: {
      id: '',
@@ -1039,7 +1085,10 @@
      itemid: '',
      expression: '',
      num: ''
    }
    },
    iscumulant: 0,
    cumuldivisor: undefined,
    cumulpoint: '',
  }
  formRef.value?.resetFields()
}