diff --git a/src/views/model/list/CreateModel.vue b/src/views/model/list/CreateModel.vue index 5873303..a79187e 100644 --- a/src/views/model/list/CreateModel.vue +++ b/src/views/model/list/CreateModel.vue @@ -23,6 +23,9 @@ export default defineComponent({ systemId: { type: Number, }, + unitId: { + type: Number, + }, }, setup(props) { const current = ref(0) @@ -50,6 +53,7 @@ export default defineComponent({ current.value++ step2Data.value = step2Values step2Values.systemId = props.systemId + step2Values.unitId = props.unitId console.log(step2Values) state.initStep3 = true } @@ -115,6 +119,8 @@ export default defineComponent({ v-show="current === 2" v-if="initStep3" :before-data="step2Data" + :system-id="systemId" + :unit-id="unitId" @prev="handleStepPrev" @next="handleStep3Next" /> diff --git a/src/views/model/list/ModelCard.vue b/src/views/model/list/ModelCard.vue index 1b915d6..c31207b 100644 --- a/src/views/model/list/ModelCard.vue +++ b/src/views/model/list/ModelCard.vue @@ -21,6 +21,9 @@ const props = defineProps({ systemId: { type: Number, }, + unitId: { + type: Number, + }, }) const [registerDraw, { openDrawer }] = useDrawer() @@ -159,7 +162,7 @@ async function confirmDelete(id: number | string) { - + diff --git a/src/views/model/list/index.vue b/src/views/model/list/index.vue index 3f7cedd..926c37c 100644 --- a/src/views/model/list/index.vue +++ b/src/views/model/list/index.vue @@ -8,10 +8,12 @@ import { PageWrapper } from '@/components/Page' const loading = ref(true) const selectData = ref(null) const systemId = ref(null) +const unitId = ref(null) function handleOptionSelected(values) { selectData.value = values systemId.value = values.system + unitId.value = values.unit } setTimeout(() => { @@ -31,6 +33,7 @@ export default defineComponent({ handleOptionSelected, selectData, systemId, + unitId, } }, }) @@ -40,7 +43,13 @@ export default defineComponent({ - + diff --git a/src/views/model/list/step/Step3.vue b/src/views/model/list/step/Step3.vue index 64ccf1e..7266e4d 100644 --- a/src/views/model/list/step/Step3.vue +++ b/src/views/model/list/step/Step3.vue @@ -26,6 +26,9 @@ export default defineComponent({ systemId: { type: Number, }, + unitId: { + type: Number, + }, }, emits: ['next', 'prev'], setup(props, { emit }) { @@ -80,6 +83,9 @@ export default defineComponent({ } }) const modelInfo = toRaw(props.beforeData) || {} + // unit carries机组id from selector (unitId is explicitly provided) + if (props.unitId !== undefined && props.unitId !== null) + modelInfo.unit = props.unitId modelInfo.pointInfo = pointInfo setProps({ submitButtonOptions: { diff --git a/src/views/model/train/index.vue b/src/views/model/train/index.vue index 75a3dea..0b007ae 100644 --- a/src/views/model/train/index.vue +++ b/src/views/model/train/index.vue @@ -3,7 +3,7 @@ import type { ComponentPublicInstance } from 'vue' import type { Dayjs } from 'dayjs' import { debounce } from 'lodash-es' import dayjs from 'dayjs' -import { computed, defineComponent, onMounted, ref, toRaw, watch } from 'vue' +import { computed, defineComponent, onMounted, ref, toRaw } from 'vue' import { useRoute, useRouter } from 'vue-router' import { Button, @@ -160,21 +160,13 @@ export default defineComponent({ scroll: { y: 300 }, }) - const updatePrincipalFromTrainTime = (trainTimeList: any[]) => { - if (!Array.isArray(trainTimeList) || !model.value) - return - // principal is the sum of mode for each trainTime entry - model.value.principal = trainTimeList.reduce((sum, item) => { + const effectiveSampleCount = computed(() => { + const list = model.value?.trainTime || [] + return list.reduce((sum: number, item: any) => { const modeVal = Number(item?.mode) return sum + (Number.isFinite(modeVal) ? modeVal : 0) }, 0) - } - - watch( - () => model.value?.trainTime, - newTrainTime => updatePrincipalFromTrainTime(newTrainTime as any[]), - { deep: true, immediate: true }, - ) + }) const activeKey = ref('1') type RangeValue = [Dayjs, Dayjs] @@ -392,6 +384,7 @@ export default defineComponent({ isInitBrush.value = false return } + console.log(isInitBrush.value,model.value?.version) if (!isInitBrush.value && model.value?.version != 'v-test') return @@ -1054,6 +1047,7 @@ export default defineComponent({ goAssessReport, showTrainActions, canEditModel, + effectiveSampleCount, } }, }) @@ -1151,7 +1145,7 @@ export default defineComponent({ }} - {{ model?.principal }} + {{ effectiveSampleCount }}