|
|
@@ -37,7 +37,7 @@
|
|
|
<hc-date-picker :dates="betweenTime" clearable :disabled="data?.isView" @change="betweenTimeUpdate" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="运营期时间:" prop="key6">
|
|
|
- <hc-date-picker :dates="betweenTime1" clearable :disabled="data?.isView" @change="betweenTimeUpdate1" />
|
|
|
+ <hc-date-picker :dates="betweenTime1" :disabled="data?.isView" @change="betweenTimeUpdate1" />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="hc-form-item">
|
|
|
@@ -45,10 +45,11 @@
|
|
|
<el-input v-model="baseForm.operationCompany" clearable placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="实际运营里程(公里):" prop="actualOperatingMileage">
|
|
|
- <HcInputNumberNum v-model="baseForm.actualOperatingMileage" clearable placeholder="请输入" class="w-full" />
|
|
|
+ <el-input-number v-model="baseForm.actualOperatingMileage" :controls="false" class="w-full" />
|
|
|
+ <!-- <HcInputNumberNum v-model="baseForm.actualOperatingMileage" clearable placeholder="请输入" class="w-full" /> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="车道数" prop="lane">
|
|
|
- <HcInputNumberNum v-model="baseForm.lane" clearable placeholder="请输入" class="w-full" />
|
|
|
+ <el-input v-model="baseForm.lane" clearable placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -399,25 +400,21 @@ watch(() => stageYearOptions1.value, (newOptions) => {
|
|
|
console.log(newOptions, 'newOptions')
|
|
|
|
|
|
if (newOptions && newOptions.length > 0) {
|
|
|
- // 更新 yearFuns 的年份
|
|
|
- // yearFuns.value = yearFuns.value.map(item => ({
|
|
|
- // ...item,
|
|
|
- // year: item.year || newOptions[0].value,
|
|
|
- // }))
|
|
|
+
|
|
|
carSelectIndex.value = 0
|
|
|
// 更新 carList 的年份
|
|
|
carList.value = carList.value.map(item => ({
|
|
|
...item,
|
|
|
year: item.year || newOptions[0].value,
|
|
|
}))
|
|
|
- console.log(yearFuns.value, 6666)
|
|
|
- console.log(stageYearOptions.value, 8888)
|
|
|
+ console.log(carList.value, 'carList')
|
|
|
+ console.log(stageYearOptions1.value, 'stageYearOptions1')
|
|
|
// 遍历stageYearOptions,检查yearFuns中是否缺少对应年份的数据
|
|
|
stageYearOptions1.value.forEach(option => {
|
|
|
const existingYear = carList.value.find(item => item.year === option.value)
|
|
|
if (!existingYear) {
|
|
|
carList.value.push({
|
|
|
- year: option.value,
|
|
|
+ year: option.value.toString(),
|
|
|
numbers: Array(12).fill(''), // 初始化12个月份的数据,默认值为0
|
|
|
})
|
|
|
}
|
|
|
@@ -425,6 +422,8 @@ watch(() => stageYearOptions1.value, (newOptions) => {
|
|
|
|
|
|
// 按年份排序
|
|
|
carList.value.sort((a, b) => a.year - b.year)
|
|
|
+ console.log(carList.value, 'carList.value77777777')
|
|
|
+
|
|
|
}
|
|
|
}, { immediate: true })
|
|
|
|
|
|
@@ -499,7 +498,7 @@ stageYearOptions.value = [{
|
|
|
|
|
|
}
|
|
|
console.log(stageYearVal.value, 'stageYearVal.value')
|
|
|
- if (!stageYearVal.value) {
|
|
|
+ if (!stageYearVal.value && !(data['operationStartTime'] && data['operationStartTime'])) {
|
|
|
stageYearVal.value = '1'
|
|
|
}
|
|
|
|
|
|
@@ -772,15 +771,21 @@ const carYearVal = ref('')
|
|
|
|
|
|
const carSelectIndex = ref(0)// ... existing code ...
|
|
|
const carYearClick = (year) => {
|
|
|
+ console.log(year, 'year4444444')
|
|
|
+
|
|
|
carYearVal.value = year
|
|
|
if (carList.value[carSelectIndex]) {
|
|
|
carList.value[carSelectIndex].year = year
|
|
|
}
|
|
|
|
|
|
- // carSelectIndex.value = arrIndex(stageYearOptions1.value, 'value', year)
|
|
|
- carSelectIndex.value = arrIndex(carList.value, 'value', year)
|
|
|
+ // carSelectIndex.value = arrIndex(carList.value, 'year', year)
|
|
|
+ carSelectIndex.value = arrIndex(stageYearOptions1.value, 'value', year)
|
|
|
+
|
|
|
+ console.log( carSelectIndex.value, ' carSelectIndex.value')
|
|
|
|
|
|
if (!carList.value[carSelectIndex.value]) {
|
|
|
+ console.log(222222222)
|
|
|
+
|
|
|
// 如果当前索引位置没有数据,初始化一个新对象
|
|
|
carList.value[carSelectIndex.value] = {
|
|
|
year: year,
|
|
|
@@ -790,7 +795,7 @@ const carYearClick = (year) => {
|
|
|
// 如果对象已存在,只更新年份
|
|
|
// carList.value[carSelectIndex.value].year = year
|
|
|
if (baseForm.value.id) {
|
|
|
- carList.value[carSelectIndex.value].numbers = baseForm.value.list[carSelectIndex.value].numbers
|
|
|
+ // carList.value[carSelectIndex.value].numbers = baseForm.value.list[carSelectIndex.value].numbers
|
|
|
|
|
|
}
|
|
|
|