caoyan/energy_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

规则修改

Browse Source
This commit is contained in:
jiangyinzhi
2024-11-19 17:06:20 +08:00
parent 455c8b58da
commit 7f7ff91a5e
4 changed files with 108 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/energyEfficiency/constructionInfo.vue
+15 -4
View File
@@ -57,11 +57,12 @@
<van-cell title="是否享受峰谷平电价" required is-link :value="showData.valleyElectricityPrices1" @click="showPicker3 = !showForm" />
<van-cell title="是否使用绿电交易" required is-link :value="showData.greenElectricityTrading1" @click="showPickerLd = !showForm" />
<van-cell title="已使用清洁能源" required is-link :value="result1" @click="showPicker4 = !showForm" />
<van-field v-model="formData.photovoltaicArea" required :rules="[{ required: gfShow == 1, message: '请填写光伏总建设面积' }]" label="光伏总建设面积(㎡)" placeholder="请输入" type="number" input-align="right" v-if="gfShow == 1">
<van-field v-model="formData.photovoltaicArea" required :rules="[{ required: gfShow == 1 }]" label="光伏总建设面积(㎡)" placeholder="请输入" type="number" input-align="right" v-if="gfShow == 1">
</van-field>
<div class="tips" v-if="tips8 == true">光伏总建设面积+可利用屋面面积＜总建筑面积</div>
<van-field v-model="formData.photovoltaicPhotovoltaic" required :rules="[{ required: gfShow == 1, message: '请填写总装机容量' }]" label="光伏总装机容量(kW)" placeholder="请输入" type="number" input-align="right" v-if="gfShow == 1">
<div class="tips" v-if="tips8 == true&&gfShow == 1">光伏总建设面积+可利用屋面面积＜总建筑面积</div>
<van-field v-model="formData.photovoltaicPhotovoltaic" required :rules="[{ required: gfShow == 1 }]" label="光伏总装机容量(kW)" placeholder="请输入" type="number" input-align="right" v-if="gfShow == 1">
</van-field>
<div class="tips" v-if="tips9 == true&&gfShow == 1">50×光伏已建设面积/1000＜光伏总装机容量＜200×光伏已建设面积/1000</div>
<van-cell title="是否采用再生水" is-link :value="showData.reclaimedWater1" @click="showPicker5 = !showForm" />
<van-cell title="再生水类型" is-link :value="result222" @click="showPicker6 = !showForm" v-if="formData.reclaimedWater == 1" required :rules="[{ required: true}]" />
<van-cell title="再生水类型" is-link title-style="color: #999" value="无" v-else />
@@ -670,6 +671,12 @@ export default {
return false
}
return true
},
tips9(){
if(50*Number(this.formData.photovoltaicArea)/1000 < this.formData.photovoltaicPhotovoltaic && 200 * Number(this.formData.photovoltaicArea)/1000 > this.formData.photovoltaicPhotovoltaic){
return false
}
return true
}
},
created() {
@@ -1857,9 +1864,13 @@ export default {
// this.formData.enquireIds = this.aarr1.concat(this.aarr)
// }
// this.tips6 == true ||
if(this.tips0 == true || this.tips1 == true || this.tips2 == true || this.tips3 == true || this.tips4 == true || this.tips6 == true || this.tips7 == true|| this.tips8 == true){
if(this.tips0 == true || this.tips1 == true || this.tips2 == true || this.tips3 == true || this.tips4 == true || this.tips6 == true || this.tips7){
return;
}
if(this.gfShow == 1&&(this.tips8||this.tips9)){
this.active=1
return
}
this.formData.enquireIds = this.newAnswer.join();
if (this.tidCid) {
this.formData.taskId = this.tidCid.taskId
src/views/energyEfficiency/energyConsumption.vue
+3 -2
View File
@@ -271,6 +271,7 @@ export default {
onConfirmYear(data) {
this.currentTime.y = data.value
this.currentTime.time = new Date(data.value)
this.page.pageNum = 1
this.getMonthData();
this.datePopup = false;
},
@@ -299,7 +300,7 @@ export default {
// 加载状态结束
this.loading = false
// 数据全部加载完成
if (this.monthList.length == this.page.total) {
if (this.page.pageNum == res.data.pages ||this.monthList.length == this.page.total) {
this.immediateCheck = false
this.finished = true
return
@@ -321,7 +322,7 @@ export default {
if (res.code == 0) {
this.monthList = res.data.list;
this.page.total = res.data.total
if(this.monthList.length == this.page.total) {
if(this.page.pageNum == res.data.pages || this.monthList.length == this.page.total) {
this.immediateCheck = false
this.finished = true
} else {