用能人数校验、分体式空调加字段

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 定义变量
-VUE_APP_CITY_TYPE = ''
+VUE_APP_CITY_TYPE = 'ah'
 
 # 开发环境接口调用前缀
 # VUE_APP_BASE_API = '/dev-api'

src/api/axios.js

@@ -35,7 +35,7 @@ const LoadingInstance = {
 function myAxios(axiosConfig, customOptions) {
   const service = axios.create({
     baseURL: axiosConfig.type ? '' : baseURLs, // 设置统一的请求前缀
-    timeout: 20000, // 设置统一的超时时长
+    timeout: 30000, // 设置统一的超时时长
   });
 
   // 自定义配置
@@ -143,8 +143,8 @@ function httpErrorStatusHandle(error) {
       // console.log(router,'114');
         // router.push('/login')
         // eslint-disable-next-line no-case-declarations
-        let pathName = sessionStorage.getItem('path')
+        // let pathName = sessionStorage.getItem('path')
-        router.push(pathName)
+        // router.push(pathName)
         break;
       case 403: message = '您没有权限操作！'; break;
       case 404: message = `请求地址出错: ${error.response.config.url}`;  break; // 在正确域名下

src/api/config.js

@@ -5,7 +5,7 @@ if (process.env.NODE_ENV === 'development') {
   // 测试环境
   // baseURL = 'http://172.29.69.38:28083/'  //后端ip和端口
   // baseURL = 'http://192.168.1.116:28083/' //测试后端ip和端口
-  baseURL = 'http://172.29.69.38:19012/' //测试后端ip和端口
+  baseURL = 'http://172.29.106.250:19012/' //测试后端ip和端口
  
 } else {
   // 生产环境

src/api/energyConsumption.js

@@ -2,7 +2,13 @@ import  myAxios  from "./axios";
 const sx = process.env.VUE_APP_CITY_TYPE == 'sx'?'/ferry_service/ferryController/conveyor':''
 
 //建筑能耗数据信息
-
+export function factorlist(data) {
+  return myAxios({
+    url: `${sx}/energy-effcicency-net-service/nxzdReferFactorNet/list`, //后端接口路由
+    method: 'post',
+    data,
+  })
+}
 /**
  * 查询建筑能耗 -- 年
  * @param {

src/api/universalEnergy.js

@@ -264,3 +264,12 @@ export function enterprisEdit(params) {
         data: params
     })
 }
+
+// 判断是否淘汰设备
+export function checkEquipDieout(params) {
+    return myAxios({
+        url: `${sx}/energy-effcicency-net-service/nxzdUseEnergyEquipNet/checkEquipDieout`,
+        method: 'POST',
+        data: params
+    })
+}

src/mixins/dieoutMixin.js

@@ -0,0 +1,65 @@
+import { checkEquipDieout } from "@/api/universalEnergy.js"
+const dieoutMixin = {
+    methods: {
+        // 改变台数
+        changeDataNum(type, arrModel, arrAbsoleteNum, form, systemNum){
+          form=form||'form'
+          systemNum=systemNum||'systemNum'
+          arrModel.map((ele, index) => {
+            this.changeData(type, ele, arrAbsoleteNum[index], form, systemNum)
+          })
+        },
+        changeData(type, model, absoleteNum, form, systemNum){
+          form=form||'form'
+          systemNum=systemNum||'systemNum'
+          if(this[form][model+'isDieout']=='1'&&this[form][model]){
+            this.$set(this[form], absoleteNum,  this[form][systemNum])
+          }else if( this[form][model+'isDieout']=='0'&&this[form][model]){
+            this.$set(this[form], absoleteNum, '0')
+          }else if(!this[form][model+'isDieout']&&this[form][model]){
+            this.checkEquipDieout(type, model, absoleteNum, form, systemNum)
+          }
+    
+        },
+        // 判断是否淘汰设备
+        checkEquipDieout(type, model, absoleteNum, form, systemNum){
+          form=form||'form'
+          systemNum=systemNum||'systemNum'
+          if(!this[form][model]) return
+          let params = {
+            systemType: type,
+            systemModel: this[form][model]
+          }
+          checkEquipDieout(params).then((res) => {
+            if(res&&res.code==0){
+              this.$set(this[form], model+'isDieout',res.data.isDieout)
+              if(res.data.isDieout=='1'){
+                this.$message.warning('该设备为淘汰设备!')
+              }
+              this.changeData(type, model, absoleteNum, form, systemNum)
+            }
+    
+          })
+        },
+
+    }
+}
+
+const modelValidatorMixin= {
+  data() {
+    const modelValidator = ( value, rule) => {
+      if(value){
+        return /^.{2,30}$/.test(value)
+      }
+      if(!rule.required){
+        return true
+      }
+
+    }
+      return {
+          modelValidator,
+
+    }
+  }
+}
+export  {dieoutMixin, modelValidatorMixin}

src/store/module/user.js

@@ -39,7 +39,7 @@ const getDefaultState = () => ({
   },
   cityType: true, //外观图片必填
   cityIsNx: process.env.VUE_APP_CITY_TYPE=='nx',  //宁夏特供-公共机构配电获取
-  imageRecognition: process.env.VUE_APP_CITY_TYPE=='ah', // 图像识别
+  imageRecognition: process.env.VUE_APP_CITY_TYPE=='ah'||process.env.VUE_APP_CITY_TYPE=='cq', // 安徽、重庆有图像识别
   validate: process.env.VUE_APP_CITY_TYPE=='ah', // 大区间校验 任务列表 用户客户标识
   cityisXj: process.env.VUE_APP_CITY_TYPE=='xj', // 报告-二氧化碳系数
 })

src/views/comment/components/cleanEnery.vue

@@ -114,6 +114,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='energyReport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         // console.log(res.data.customerId);
         if (res.code == 0) {

src/views/comment/components/device.vue

@@ -73,7 +73,7 @@
                       EnergyReportInfo.centralizeCoolCapacity
                     }}千瓦。 机组平均能效比为{{
                       EnergyReportInfo.centralizeAverageCop
-                    }}， 机组最长投运年限为{{
+                    }}（总制冷量/总功率）， 机组最长投运年限为{{
                       EnergyReportInfo.centralizeMinUseYear
                     }}年。
                   </td>
@@ -112,7 +112,7 @@
               合计{{ EnergyReportInfo.multipleNum }}台，
               <span v-if="false">总额定功率为{{ EnergyReportInfo.multipleRatedPower }}千瓦，机组平均能效比为{{
               EnergyReportInfo.multipleAverageCop
-            }}，</span>设备最长投运年限为{{ EnergyReportInfo.multipleMinUseYear }}年。
+            }}（总制冷量/总功率），</span>设备最长投运年限为{{ EnergyReportInfo.multipleMinUseYear }}年。
             </div>
           </div>
         </div>
@@ -230,7 +230,9 @@
           EnergyReportInfo.heatRatedPower
         }}（吨/立方米/千瓦），总制热量为{{
           EnergyReportInfo.heatCapacity
-        }}千瓦，机组最长投运年限为{{ EnergyReportInfo.heatUnitMinUseYear }}年。
+        }}千瓦，
+        机组平均能效比为{{(EnergyReportInfo.heatRatedPower/EnergyReportInfo.heatCapacity).toFixed(2)}}（总制热量/总功率），
+        机组最长投运年限为{{ EnergyReportInfo.heatUnitMinUseYear }}年。
         </span>
 
         采暖泵合计{{ EnergyReportInfo.heatPumpNum}}台，总额定功率为{{
@@ -626,6 +628,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='energyReport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         // console.log(res.data.customerId);
         if (res.code == 0) {

src/views/comment/components/energyReport-quota.vue

@@ -716,6 +716,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='energyReport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         // console.log(res.data.customerId);
         if (res.code == 0) {

src/views/comment/components/manage.vue

@@ -156,7 +156,7 @@
           </div>
         </div>
         <div class="manage-start-text">
-          在建筑用能管理方面，贵单位{{ EnergyReportInfo.energyPlatform }}能源管控平台<span v-if="!(EnergyReportInfo.platformFeatures.split('')[0] == '未'||EnergyReportInfo.platformFeatures == '无')">，平台的功能包括具备{{ EnergyReportInfo.platformFeatures }}功能</span>。
+          在建筑用能管理方面，贵单位{{ EnergyReportInfo.energyPlatform }}能源管控平台<span v-if="!(EnergyReportInfo.platformFeatures&&(EnergyReportInfo.platformFeatures.split('')[0] == '未'||EnergyReportInfo.platformFeatures == '无'))">，平台的功能包括具备{{ EnergyReportInfo.platformFeatures }}功能</span>。
           <span v-if="!(EnergyReportInfo.useEnergy == '无')"> 
             使用能源({{ EnergyReportInfo.useEnergy }})已经具备分项计量功能，用能单位能源计量器具配备{{ EnergyReportInfo.meterComplete }}。
           </span>
@@ -264,6 +264,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='energyReport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         // console.log(res.data.customerId);
         if (res.code == 0) {

src/views/comment/components/report.vue

@@ -26,9 +26,12 @@
             <!-- <van-dropdown-menu class="timeSelect" v-if="timeSelectShow" >
               <van-dropdown-item v-model="yearVal" :options="yearList" @change="handelChangeTime" />
             </van-dropdown-menu> -->
-            <div class="detail2-right-top-reset" @click="generateReport" v-if="timeSelectShow">
+            <div class="detail2-right-top-reset" @click="generateReport(false)" v-if="timeSelectShow">
               重新生成
             </div>
+            <div class="detail2-right-top-reset" @click="generateReport(true)" v-if="timeSelectShow&&isCq">
+              刷新
+            </div>
           </div>
           <div class="detail2-right-bottom">
             {{userCode}}：
@@ -212,6 +215,9 @@ export default {
         res ='|' + this.EnergyReportInfo.buildType.split('/')[0]
       }
       return '公共机构'+res
+    },
+    isCq(){
+      return  process.env.VUE_APP_CITY_TYPE=='cq'
     }
     
   },
@@ -224,8 +230,8 @@ export default {
   created() {
     this.level = sessionStorage.getItem('level')
     this.getEnergyReportInfo()
-    this.doDebounce = debounce(function () {
+    this.doDebounce = debounce(function (flag) {
-      this.getGenerateReport()
+      this.getGenerateReport(flag)
     }, 5000, true)
   },
   methods: {
@@ -423,13 +429,14 @@ export default {
       this.$router.push({path: '/energyReport'})
     },
     // 重新生成
-    generateReport(){
+    generateReport(flag){
-      this.doDebounce()
+      this.doDebounce(flag)
     },
-    async getGenerateReport() {
+    async getGenerateReport(flag) {
       let data = {
         customerId: this.energyData.customerId,
-        taskId: this.energyData.taskId
+        taskId: this.energyData.taskId,
+        refresh: flag
       }
       this.$toast.loading({
         duration: 0, // 持续展示 toast

src/views/comment/components/transform.vue

@@ -164,7 +164,7 @@ export default {
     this.signed = sessionStorage.getItem('signed')
 
     const obj = JSON.parse(sessionStorage.getItem('tidCid'))
-    if(obj.item && obj.item.isState) {
+    if(obj&&obj.item && obj.item.isState) {
       this.isState = obj.item.isState
     }
 
@@ -181,6 +181,7 @@ export default {
   computed: {
     ...mapState('report', ['EnergyReportInfo']),
     levelShow() {
+      // 客户经理 2
       if(this.$store.getters.userLevel != 2) {
         return false
       } 
@@ -268,6 +269,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='energyReport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         // console.log(res.data.customerId);
         if (res.code == 0) {

src/views/energyEfficiency/TaskFilling.vue

@@ -114,6 +114,7 @@ import {
   editEnergyEquip,
 } from '@/api/energyConsumption'
 import { dataMode } from '@/views/facilityManage/common.js'
+import { getYearList } from "@/api/energyConsumption.js";
 export default {
   name: 'TaskFilling',
   components: {
@@ -623,12 +624,39 @@ export default {
     clearData() {
       this.item = {}
     },
+    //获取能耗数据
+    async getDataInit() {
+        const id = JSON.parse(sessionStorage.getItem("tidCid")).customerId;
+        const data = {
+            customerId: id,
+            pageNum: 1,
+            pageSize: 10,
+        };
+        return new Promise((resolve, reject) => {
+          getYearList(data).then((res) => {
+          let {code, data} = res
+          if (code == 0) {
+            resolve(data.list)
+          }
+        })
+      })
+    },
     //提交页面信息
-    saveAllInfo() {
+    async saveAllInfo() {
       const city =  process.env.VUE_APP_CITY_TYPE=='cq'
       const must = this.iconList&&this.iconList.some(ele => ele.typeId == '1'||ele.typeId=='8'||ele.typeId=='9')&&this.iconList.some(ele => ele.typeId=='3')&&this.iconList.some(ele => ele.typeId=='4')
-      // )&&ele.typeId=='3'&&ele.typeId=='4'}
      console.log(city, must ,this.iconList, 'lllllllllllllllllll')
+     let yearList = await this.getDataInit()
+      let noWaterList = yearList.filter(ele => {return !ele.useWater })
+      console.log(noWaterList, 'yearList')
+      if(city&&noWaterList.length>0){
+        this.$notify({
+          message: '能耗信息数据里的用水量必填',
+          duration: 1000,
+          type: 'warning'
+        })
+        return
+      }
       if(!must&&city){
         this.$notify({
           message: '主要用能设备空调至少填一个、照明系统与配电系统必填',

src/views/energyEfficiency/constructionInfo.vue

@@ -13,12 +13,13 @@
                                   <van-field v-model="formData.buildName" label="建筑名称" required :rules="[{  required: true, message: '请填写建筑名称' }]" placeholder="请输入" input-align="right">
                                   </van-field>
                                   <van-cell title="建筑类型" is-link :value="showData.buildType1" required @click="showPicker = !showForm"/>
+                                  <van-field label="其他类型" required :rules="[{  required: true, message: '请填写具体类型' }]" v-if="formData.buildType==5" v-model="formData.otherDesc" input-align="right" />
                                   <van-cell :title="userCode" :value="formData.consNo" />
                                   <van-cell title="统一社会识别编码" :value="formData.creditCode" />
                                   <van-cell title="联系人" :value="formData.contactName" />
                                   <van-cell title="联系人手机号" :value="formData.contactPhone" />
                                   <van-cell title="详细地址" :value="formData.detailAddress" />
-                                  <van-field v-model="formData.totalArea" v-input.float label="总建筑面积(㎡)" placeholder="请输入" @input="showTips" @blur="checkArea" type="number" required :rules="[{  required: true }]" input-align="right">
+                                  <van-field v-model="formData.totalArea" v-input.float label="总建筑面积(㎡)" placeholder="只统计当前户号（区域）" @input="showTips" @blur="checkArea" type="number" required :rules="[{  required: true }]" input-align="right">
                                   </van-field>
                                   <div class="tips" v-if="checkAreaTip">同一社会信用代码下建筑面积和用能人数重复</div>
                                   <div class="tips" v-if="!checkAreaTip&&formData.totalArea>50000">总建筑面积&gt;5万平方米，请确认是否属实</div>
@@ -41,8 +42,9 @@
                                   <div class="tips" v-if="tips7 == true">数据机房面积≤0.5*总建筑面积</div>
                                   <van-cell title="建筑投运年份(年)" is-link required :rules="[{  required: true, message: '请选择建筑投运年份年份' }]" :value="formData.operationYear" @click="handelOpen" />
                                   <!-- <van-field v-model="formData.operationYear" label="建筑投运年份(年)" label-width="140" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('operationYear', 'SET_HEAT_YEAR')" /> -->
-                                  <van-field v-model="formData.peopleNum" v-input.numNo0 required  @blur="checkArea" :rules="[{required: true, message: `请先选择建筑类型再填写` }]" :label="peopleShow" placeholder="" type="number" input-align="right">
+                                  <van-field v-model="formData.peopleNum" v-input.numNo0 required  @blur="checkArea" :rules="[{required: true,  }]" :label="peopleShow" placeholder="只统计当前户号（区域）" type="number" input-align="right">
                                   </van-field>
+                                  <div class="tips" v-if="tips10 == true">0.1≤单位面积人数≤200</div>
                                   <div class="tips" v-if="checkAreaTip">同一社会信用代码下建筑面积和用能人数重复</div>
                                   <van-cell title="建筑外观照片"  :required="$store.getters.cityType"  :rules="[{  required: $store.getters.cityType}] "/>
                                   <van-uploader  v-model="fileList" :max-count="3"  :after-read="afterRead" :before-delete="delImg" @click-upload="onUpload" preview-size="100px" class="uploader" ref="file" />
@@ -338,6 +340,7 @@ export default {
             tips6: false,
             tips7: false,
             // tips8: false,
+            tips10: false,
             newAnswer: [],    // 问答题存
             loading:false,
             result1: '无',
@@ -731,6 +734,7 @@ export default {
 
   methods: {
     async checkArea(){
+        this.showTips10()
         if(this.formData.totalArea>50000&&this.formData.peopleNum){
             let params = {
                 totalArea: this.formData.totalArea,
@@ -812,6 +816,14 @@ export default {
             this.tips7 = false
         }
     },
+    showTips10() {
+        let rate = Number(this.formData.totalArea)/ Number(this.formData.peopleNum)
+        if( rate<0.1|| rate> 200) {
+            this.tips10 = true
+        }else {
+            this.tips10 = false
+        }
+    },
     buildTypeChange(val) {
       this.showPicker = false
       switch (val[0]) {
@@ -998,6 +1010,10 @@ export default {
                             //         ele.disabled = false
                             //     }
                             // })
+                          }else{
+                            this.showData.buildType1 =  this.option[i].text
+                            this.mainActiveIndex = i
+
                           }
                       }
                       
@@ -1276,18 +1292,22 @@ export default {
                         this.mainActiveIndex = 0
                         res.data.forEach((v, i) => {
                             if(v.code == select) this.mainActiveIndex = i
-                            const list = v.child.map((ele) => {
+                            let list = []
+                            if(v.child){
+                                list = v.child.map((ele) => {
                                     return {
                                         text: ele.name,
                                         id: ele.code,
                                         pCode: ele.pCode
                                     }
                                 })
+                            }
+
                             arr.push({
                                 text: v.name,
                                 value: v.code,
                                 children: list,
-                                disabled: select!=5&&!(v.code == select)
+                                disabled: select!=6&&!(v.code == select)
                             })
                         })
                         this.option = arr
@@ -1873,7 +1893,7 @@ export default {
             //     this.formData.enquireIds = this.aarr1.concat(this.aarr)
             // }
             // this.tips6 == true ||
-            if(this.checkAreaTip|| this.tips0 == true || this.tips1 == true || this.tips2 == true || this.tips3 == true || this.tips4 == true || this.tips6 == true || this.tips7){
+            if(this.checkAreaTip|| this.tips0 == true || this.tips1 == true || this.tips2 == true || this.tips3 == true || this.tips4 == true || this.tips6 == true || this.tips7 || this.tips10){
                 return;
             }
             if(this.gfShow == 1&&(this.tips8||this.tips9)){

src/views/energyEfficiency/taskManage.vue

@@ -287,6 +287,7 @@ import { getCurrentPersonInfoAPI } from "@/api/customerIformation.js";
 import { getCode } from '@/api/common.js'
 import Year from '@/views/facilityManage/common-vue/year.vue'
 import {debounce} from '@/utils/common.js'
+import { Dialog, Notify } from 'vant';
 
 // import Loading from '@/components/loading'
 export default {
@@ -503,6 +504,32 @@ export default {
     // 任务信息填报
     async filling(item) {
       this.setCurrentTidCidPersonInfo(item)
+      const that = this
+      const res = await getCurrentPersonInfoAPI(item.customerId)
+      if (res.code == 0) {
+        this.creditCode = res.data.creditCode
+        if(!res.data.creditCode||res.data.creditCode=='null'||!res.data.contactName||res.data.contactName=='null'||!res.data.contactPhone||res.data.contactPhone=='null'){
+              Dialog.confirm({
+                  title: '提示',
+                  message: '请前往配置信息页面，填写用户基本信息',
+                  beforeClose: async (action, done) => {
+                      if (action === 'confirm') {
+                        that.archivalInformation();
+                        done();
+                      }else {
+                          done();
+                      }
+                  }
+              })
+            return
+
+        }
+      } else {
+        this.$notify({
+            type: 'danger',
+            message: res.msg
+        })
+      }
       if (item.type == '01') {
         this.$router.push({
           name: 'TaskFilling'
@@ -520,19 +547,6 @@ export default {
           })
         } else {
           sessionStorage.removeItem('enterpriseId')
-          try {
-          const res = await getCurrentPersonInfoAPI(item.customerId)
-          if (res.code == 0) {
-            this.creditCode = res.data.creditCode
-          } else {
-            this.$notify({
-                type: 'danger',
-                message: res.msg
-            })
-          }
-          } catch (error) {
-            console.log(error);
-          }
           this.$router.push({
             name: 'acquisition',
             params: {
@@ -542,6 +556,21 @@ export default {
         }
       }
     },
+    
+    //获取当前页面信息
+    getPathInfo() {
+      let currentPath = {}
+        currentPath.path = this.$route.path
+        currentPath.name = '客户信息填报'
+        this.$store.commit('path/SET_PATH', currentPath)
+        sessionStorage.setItem('goPage', JSON.stringify(currentPath))
+    },
+    // 档案信息
+    archivalInformation() {
+      this.getPathInfo()
+      console.log('/archivalinformation');
+      this.$router.push('/archivalinformation')
+    },
     // 能效诊断跳转
     nengxiaozd(item) {
       this.setCurrentTidCidPersonInfo(item)

src/views/energyEfficiency/yearEnergy.vue

@@ -14,19 +14,19 @@
                 </div>
                 <div class="nengyuan">
                     <van-cell-group>
-                        <van-field :disabled="showForm" type="number" v-input.floatNo0 v-model="yearForm.power" label="电(kWh)" placeholder="请输入" />
+                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.floatNo0 v-model="yearForm.power" label="电(kWh)" placeholder="请输入" />
-                        <van-field :disabled="showForm" type="number" v-input.reset v-model="yearForm.naturalGas" label="天然气(m³)" placeholder="请输入" />
+                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.reset v-model="yearForm.naturalGas" label="天然气(m³)" placeholder="请输入" />
-                        <van-field :disabled="showForm" type="number" v-input.reset v-model="yearForm.steam" label="饱和蒸汽(t)" placeholder="请输入" />
+                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.reset v-model="yearForm.steam" label="饱和蒸汽(t)" placeholder="请输入" />
-                        <van-field :disabled="showForm" type="number" v-input.reset v-model="yearForm.dieselGas" label="柴油(L)" placeholder="请输入" />
+                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.reset v-model="yearForm.dieselGas" label="柴油(L)" placeholder="请输入" />
-                        <van-field :disabled="showForm" type="number" v-input.reset v-model="yearForm.gasoline" label="汽油(L)" placeholder="请输入" />
+                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.reset v-model="yearForm.gasoline" label="汽油(L)" placeholder="请输入" />
                         <van-field  :disabled="showForm" type="number" v-input.reset v-model="yearForm.petroleumGas" label="液化石油气(t)" placeholder="请输入" />
-                        <van-field :disabled="showForm" type="number" v-input.reset v-model="yearForm.hot" label="热力(GJ)" placeholder="请输入" />
+                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.reset v-model="yearForm.hot" label="热力(GJ)" placeholder="请输入" />
-                        <van-field :disabled="showForm" type="number" v-input.reset v-model="yearForm.coal" label="煤炭(t)" placeholder="请输入" />
+                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.reset v-model="yearForm.coal" label="煤炭(t)" placeholder="请输入" />
                         <van-field  :disabled="showForm" type="number" v-input.reset v-model="yearForm.gasSelfHeating" label=" 燃气自供暖(m³)" placeholder="请输入" />
                         <van-field  :disabled="showForm" type="number" v-input.reset v-model="yearForm.centralHeating" label=" 集中供暖(GJ)" placeholder="请输入" />
                         <van-field  :disabled="showForm" type="number" v-input.reset v-model="yearForm.dataRoom" label=" 机房总电能消耗(kWh)" placeholder="请输入" />
                         <van-field  :disabled="showForm" type="number" v-input.reset v-model="yearForm.energyConsumptionInformationEquipment" label=" 信息设备电能消耗(kWh)" placeholder="请输入" />
-                        <van-field :disabled="showForm" type="number" v-input.reset v-model="yearForm.energyOther" label="其他" placeholder="请输入" />
+                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.reset v-model="yearForm.energyOther" label="其他" placeholder="请输入" />
                     </van-cell-group>
                 </div>
                 <!-- 资源 -->
@@ -49,6 +49,18 @@
                         <van-field v-model="yearForm.energyPv" v-input.reset :disabled="showForm" type="number" label="光伏(kWh)" placeholder="请输入" />
                     </van-cell-group>
                 </div>
+                <!-- 能耗折标煤数据 -->
+                <div class="title">
+                    <div class="title-img"><img src="@/assets/u239.png" alt="" /></div>
+                    <p>能耗折标煤数据</p>
+                </div>
+                <div class="nengyuan">
+                    <van-cell-group>
+                        <van-field v-for="(item,index) in propsList" :key='index' :disabled="true" type="number" v-input.floatNo0 v-model="yearForm[item.prop2]" :label="item.name+'(tce)'" placeholder="请输入" />
+                        <van-field v-model="yearForm.allswitch" v-input.reset :disabled="true" type="number" label="总能耗" placeholder="请输入" />
+                    
+                    </van-cell-group>
+                </div>
     
             </div>
     
@@ -64,13 +76,67 @@
 <script>
 // import Header from "@/components/headerNew";
 import { Notify } from "vant";
-import { yearEdit, getSingleYearInfo } from "@/api/energyConsumption";
+import { yearEdit, getSingleYearInfo, factorlist} from "@/api/energyConsumption";
 export default {
     components: {
         // Header,
     },
     data() {
         return {
+            propsList:[
+                {
+                type: '01',
+                name: '电',
+                prop1: 'power',
+                prop2: 'switchElectricity',
+                },{
+                type: '02',
+                name: '天然气',
+                prop1: 'naturalGas',
+                prop2: 'switchGas',
+                // },{
+                // type: '03',
+                // name: '饱和蒸汽',
+                // prop1: 'steam',
+                // prop2: '',
+                },{
+                type: '04',
+                name: '柴油',
+                prop1: 'dieselGas',
+                prop2: 'switchDiesel',
+                // },{
+                // type: '06',
+                // name: '用水量',
+                // prop1: 'useWater',
+                // prop2: '',
+                // },{
+                // type: '07',
+                // name: '光伏',
+                // prop1: 'energyPv',
+                // prop2: '',
+                },{
+                type: '08',
+                name: '热力',
+                prop1: 'hot',
+                prop2: 'switchHot',
+                },{
+                type: '09',
+                name: '煤炭',
+                prop1: 'coal',
+                prop2: 'switchCoal',
+                },{
+                type: '10',
+                name: '汽油',
+                prop1: 'gasoline',
+                prop2: 'switchGasoline',
+                },{
+                type: '05',
+                name: '其他',
+                prop1: 'energyOther',
+                prop2: 'switchOther',
+                }
+
+            ],
             title: "逐年能源账单详情",
             yearForm: {
                 dieselGas: 0,
@@ -89,7 +155,8 @@ export default {
                 centralHeating: 0,
                 energyConsumptionInformationEquipment: 0,
             },
-            tidCid: null
+            tidCid: null,
+            dataList:[]
         };
     },
     computed: {
@@ -108,6 +175,17 @@ export default {
         this.getData();
     },
     methods: {
+        changeData(){
+            let sum = 0
+            this.dataList.map(ele => {
+                let selectData = this.propsList.filter(item=> item.type === ele.energyName)
+                if(selectData&&selectData.length>0){
+                    this.yearForm[selectData[0].prop2] = this.yearForm[selectData[0].prop1]?(this.yearForm[selectData[0].prop1]*ele.factorNum).toFixed(2):0
+                    sum+=Number(this.yearForm[selectData[0].prop2])
+                }
+            })
+            this.$set(this.yearForm, 'allswitch', sum.toFixed(2))
+        },
         //获取数据
         async getData() {
             const id = this.$route.query.id;
@@ -120,6 +198,19 @@ export default {
                 }
                 // this.yearForm = res.data;
             }
+            let params = {
+                energyName: "",
+                factorUnit: "",
+                factorNum: 0,
+                pageNum: 1,
+                pageSize: 20
+            }
+            const result = await factorlist(params)
+                if(result.code==0){             
+                    this.dataList = result.data.records
+                }
+
+            await this.changeData()
         },
         //保存修改
         async handelClickSave() {

src/views/enterprise/bengjiSystemAddEdit.vue

@@ -6,19 +6,19 @@
                 <div class="year-main">
                     <div class="nengyuan">
                         <van-cell-group>
-                            <van-field v-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" maxlength="20" label="泵机型号" placeholder="请输入泵机型号"/>
+                            <van-field @blur="checkEquipDieout('02', 'systemModel', 'absoleteNum')" v-model="form.systemModel" :rules="[{  required: false, validator:modelValidator, message:'2≤型号长度≤30'}]" maxlength="20" label="泵机型号" placeholder="请输入泵机型号"/>
-                            <van-field v-model="form.motorModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" maxlength="20" label="电机型号" placeholder="请输入电机型号"/>
+                            <van-field @blur="checkEquipDieout('02', 'motorModel', 'absoleteElecNum')" v-model="form.motorModel" :rules="[{  required: false, validator:modelValidator, message:'2≤型号长度≤30'}]" maxlength="20" label="电机型号" placeholder="请输入电机型号"/>
-                            <van-field label="设备类型" v-model="form.equipTypeName" required :rules="[{  required: true }]" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','02')" />
+                            <van-field label="设备类型" v-model="form.equipTypeName" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','02')" />
-                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                            <van-field v-input.numNo0 v-model="form.systemNum" type="number" required :rules="[{  required: true }]" label="台数（台）" placeholder="请输入台数" />
+                            <van-field @blur="changeDataNum('02', ['systemModel','motorModel'], ['absoleteNum','absoleteElecNum'])" v-input.numNo0 v-model="form.systemNum" type="number" label="台数（台）" placeholder="请输入台数" />
-                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" type="number" required :rules="[{  required: true }]" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange"/>
+                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange"/>
-                            <van-field v-input.float v-model="form.frequencyPerValue" type="number" required :rules="[{  required: true }]" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
+                            <van-field v-input.float v-model="form.frequencyPerValue" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
-                            <van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
+                            <van-field disabled v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
-                            <van-field v-input.num v-model="form.absoleteNum" type="number" label="淘汰泵机数量" placeholder="请输入" />
+                            <van-field disabled v-input.num v-model="form.absoleteNum" type="number" label="淘汰泵机数量" placeholder="请输入" />
                             <van-field v-input.floatNo0 v-model="form.efficiency" type="number" label="泵机效率（%）" placeholder="请输入"  @input="handelChangeNumber('efficiency','泵机效率')" />
                             <van-field v-input.num v-model="form.userYear" type="number" label="投入年份" placeholder="请选择投入年份" is-link  readonly @click="handelClickYear('userYear', 'SET_CON_YEAR')" />
                             <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" is-link  readonly @click="datePicker = true" />
-                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -50,6 +50,7 @@ import VanPickerNew from '@/components/vanPickerNew'
 import { pumpAdd, pumpGetInfo, pumpEdit } from "@/api/universalEnergy.js"
 import { Notify } from "vant";
 import mixin from '@/mixins/mixin'
+import {dieoutMixin, modelValidatorMixin} from '@/mixins/dieoutMixin.js'
 import Year from '../facilityManage/common-vue/year.vue'
 import {debounce} from '@/utils/common.js'
 export default {
@@ -58,7 +59,7 @@ export default {
         VanPickerNew,
         Year
     },
-    mixins: [mixin],
+    mixins: [mixin, dieoutMixin, modelValidatorMixin],
     data() {
         return {
             addeditId: '',    // 新增修改提交id

src/views/enterprise/energyManagement.vue

@@ -387,6 +387,7 @@ export default {
           newVal.forEach(v => {
             if (v) {
               this.listValue.push(v.value)
+              this.listValue = [...new Set(this.listValue)]
             }
           })
         }
@@ -691,6 +692,7 @@ export default {
               let aaa = commonEnergySystemArr[i].replace('0', '') - 1;
               this.result.push(this.list[aaa])
             }
+            this.result = [...new Set(this.result)]
           }
           //能源计量见着数据处理
           if(res.data.primaryEnergyMeterType.indexOf('0')>-1){
@@ -788,6 +790,11 @@ export default {
 
           this.list.push({ name: v.name, value: v.value })
         })
+        
+        if(this.ifEnterpriseId === ''){
+          this.result=[]
+          this.result.push(this.list[0])
+        }
       }
 
     },
@@ -803,8 +810,7 @@ export default {
         this.$toast('通用能源系统必须有配电系统')
         return
       }
-      console.log(this.listValue2, 'this.listValue2', this.list);
+      console.log(this.listValue2, 'this.listValue2', this.listValue);
-      return
       if( this.listValue2.indexOf("01") === -1){
         this.$toast('一级计量必须有勾选电')
         return

src/views/enterprise/fengjiSystemAddEdit.vue

@@ -6,19 +6,19 @@
                 <div class="year-main">
                     <div class="nengyuan">
                         <van-cell-group>
-                            <van-field v-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="风机型号" placeholder="请输入风机型号" maxlength="20" />
+                            <van-field @blur="checkEquipDieout('03', 'systemModel', 'absoleteNum')"  v-model="form.systemModel" :rules="[{  required: false, validator: modelValidator, message:'2≤型号长度≤20'}]" label="风机型号" placeholder="请输入风机型号" maxlength="20" />
-                            <van-field v-model="form.motorModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="电机型号" placeholder="请输入电机型号" maxlength="20"/>
+                            <van-field @blur="checkEquipDieout('03', 'motorModel', 'absoleteElecNum')" v-model="form.motorModel" :rules="[{  required: false, validator: modelValidator, message:'2≤型号长度≤20'}]" label="电机型号" placeholder="请输入电机型号" maxlength="20"/>
-                            <van-field label="设备类型" v-model="form.equipTypeName" required :rules="[{  required: true }]" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','03')" />
+                            <van-field label="设备类型" v-model="form.equipTypeName" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','03')" />
-                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                            <van-field v-input.numNo0 v-model="form.systemNum" required :rules="[{  required: true }]" type="number" label="台数（台）" placeholder="请输入台数" />
+                            <van-field @blur="changeDataNum('02', ['systemModel','motorModel'], ['absoleteNum','absoleteElecNum'])" v-input.numNo0 v-model="form.systemNum" type="number" label="台数（台）" placeholder="请输入台数" />
-                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" required :rules="[{  required: true }]" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',20,'单台额定功率')"/>
+                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',20,'单台额定功率')"/>
-                            <van-field v-input.float v-model="form.frequencyPerValue" required :rules="[{  required: true }]" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
+                            <van-field v-input.float v-model="form.frequencyPerValue" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
-                            <van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
+                            <van-field disabled v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
-                            <van-field v-input.num v-model="form.absoleteNum" type="number" label="淘汰风机数量" placeholder="请输入" />
+                            <van-field disabled v-input.num v-model="form.absoleteNum" type="number" label="淘汰风机数量" placeholder="请输入" />
                             <van-field v-input.floatNo0 v-model="form.efficiency" type="number" label="风机效率（%）" placeholder="请输入"  @input="handelChangeNumber('efficiency','风机效率')" />
                             <van-field v-input.num v-model="form.userYear" type="number" label="投入年份" placeholder="请选择投入年份" is-link  readonly @click="handelClickYear('userYear', 'SET_CON_YEAR')" />
                             <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" is-link  readonly @click="datePicker = true" />
-                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -51,6 +51,7 @@ import { fanAdd, fanGetInfo, fanEdit } from "@/api/universalEnergy.js"
 import { Notify } from "vant";
 // import Header from "@/components/headerNew";
 import mixin from '@/mixins/mixin'
+import {dieoutMixin, modelValidatorMixin} from '@/mixins/dieoutMixin'
 import Year from '../facilityManage/common-vue/year.vue'
 import {debounce} from '@/utils/common.js'
 export default {
@@ -59,7 +60,7 @@ export default {
         VanPickerNew,
         Year
     },
-    mixins: [mixin],
+    mixins: [mixin, dieoutMixin, modelValidatorMixin],
     data() {
         return {
             title: '新增/修改',

src/views/enterprise/generalEnergyAddEdit.vue

@@ -6,16 +6,16 @@
                 <div class="year-main">
                     <div class="nengyuan">
                         <van-cell-group>
-                            <van-field v-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="型号" maxlength="20" placeholder="请输入型号"/>
+                            <van-field @blur="checkEquipDieout('01', 'systemModel', 'absoleteNum')" v-model="form.systemModel" required :rules="[{  required: true, validator:modelValidator, message:'2≤型号长度≤30' }]" label="型号" maxlength="20" placeholder="请输入型号"/>
-                            <van-field v-input.numNo0 v-model="form.systemNum" type="number" required :rules="[{  required: true }]" label="台数（台）" placeholder="请输入台数" />
+                            <van-field @blur="changeData('01', 'systemModel', 'absoleteNum')" v-input.numNo0 v-model="form.systemNum" required :rules="[{  required: true }]" type="number" label="台数（台）" placeholder="请输入台数" />
-                            <van-field v-input.numNo0 v-model="form.ratedCapacityValue" required :rules="[{  required: true }]" ltype="number" label="单台额定容量（kVA）" placeholder="请输入" @blur="handelChange('ratedCapacityValue',50,'单台额定容量')"/>
+                            <van-field v-input.numNo0 v-model="form.ratedCapacityValue"  required :rules="[{  required: true }]" type="number" label="单台额定容量（kVA）" placeholder="请输入" @blur="handelChange('ratedCapacityValue',50,'单台额定容量')"/>
                             <van-field v-input.floatNo0 v-model="form.ratedVoltageValueText" required :rules="[{  required: true }]" type="number" label="额定一次电压（kV）" input-align="right" is-link placeholder="请选择" readonly @click="levelShow = true"/>
                             <van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
-                            <van-field v-input.num v-model="form.absoleteNum" type="number" label="淘汰变压器数量" placeholder="请输入" />
+                            <van-field disabled v-input.num v-model="form.absoleteNum" type="number" label="淘汰变压器数量" placeholder="请输入" />
-                            <van-field v-input.floatNo0 v-model="form.loadRate" required :rules="[{  required: true }]" type="number" label="负载率（%）" placeholder="请输入"  @input="handelChangeNumber('loadRate','负载率')" />
+                            <van-field v-input.floatNo0 v-model="form.loadRate" type="number" label="负载率（%）" placeholder="请输入"  @input="handelChangeNumber('loadRate','负载率')" />
-                            <van-field v-input.num v-model="form.userYear" required :rules="[{  required: true }]" type="number" label="投入年份" placeholder="请选择投入年份" is-link  readonly @click="handelClickYear('userYear', 'SET_CON_YEAR')" />
+                            <van-field v-input.num v-model="form.userYear" type="number" label="投入年份" placeholder="请选择投入年份" is-link  readonly @click="handelClickYear('userYear', 'SET_CON_YEAR')" />
-                            <van-cell title="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" type="number" placeholder="请选择设备生产日期" is-link  readonly @click="datePicker = true" />
+                            <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" is-link  readonly @click="datePicker = true" />
-                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -66,6 +66,7 @@
 import { distributeAdd, distributeGetInfo, distributeEdit } from "@/api/universalEnergy.js"
 import { Notify } from "vant";
 import mixin from '@/mixins/mixin'
+import {dieoutMixin, modelValidatorMixin} from '@/mixins/dieoutMixin.js'
 import Year from '../facilityManage/common-vue/year.vue'
 import VanPickerNew from '@/components/vanPickerNew'
 export default {
@@ -74,7 +75,7 @@ export default {
         Year,
         VanPickerNew
     },
-    mixins: [mixin],
+    mixins: [mixin, dieoutMixin, modelValidatorMixin],
     data() {
         return {
             inVoltage: '',

src/views/enterprise/kongyajiSystemAddEdit.vue

@@ -6,19 +6,19 @@
                 <div class="year-main">
                     <div class="nengyuan">
                         <van-cell-group>
-                            <van-field v-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="空压机型号" placeholder="请输入空压机型号" maxlength="20" />
+                            <van-field @blur="checkEquipDieout('04', 'systemModel', 'absoleteNum')"  v-model="form.systemModel" :rules="[{  required: false, validator: modelValidator, message:'2≤型号长度≤20'}]" label="空压机型号" placeholder="请输入空压机型号" maxlength="20" />
-                            <van-field v-model="form.motorModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="电机型号" placeholder="请输入电机型号" maxlength="20"  />
+                            <van-field @blur="checkEquipDieout('04', 'motorModel', 'absoleteElecNum')" v-model="form.motorModel" :rules="[{  required: false, validator: modelValidator, message:'2≤型号长度≤20'}]" label="电机型号" placeholder="请输入电机型号" maxlength="20"  />
-                            <van-field label="设备类型" v-model="form.equipTypeName" required :rules="[{  required: true }]" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','01')" />
+                            <van-field label="设备类型" v-model="form.equipTypeName" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','01')" />
-                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                            <van-field v-input.numNo0 v-model="form.systemNum" type="number" required :rules="[{  required: true }]" label="台数（台）" placeholder="请输入台数" />
+                            <van-field @blur="changeDataNum('04', ['systemModel','motorModel'], ['absoleteNum','absoleteElecNum'])" v-input.numNo0 v-model="form.systemNum" type="number" label="台数（台）" placeholder="请输入台数" />
-                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" required :rules="[{  required: true }]" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',5,'单台额定功率')"/>
+                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',5,'单台额定功率')"/>
-                            <van-field v-input.float v-model="form.frequencyPerValue" required :rules="[{  required: true }]" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
+                            <van-field v-input.float v-model="form.frequencyPerValue" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
-                            <van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
+                            <van-field disabled v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
-                            <van-field v-input.num v-model="form.absoleteNum" type="number" label="淘汰空压机数量" placeholder="请输入" />
+                            <van-field disabled v-input.num v-model="form.absoleteNum" type="number" label="淘汰空压机数量" placeholder="请输入" />
                             <van-field v-input.floatNo0 v-model="form.efficiency" type="number" label="空压机效率（%）" placeholder="请输入"  @input="handelChangeNumber('efficiency','空压机效率')" />
                             <van-field v-input.num v-model="form.userYear" type="number" label="投入年份" placeholder="请选择投入年份" is-link  readonly @click="handelClickYear('userYear', 'SET_CON_YEAR')" />
                             <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" is-link  readonly @click="datePicker = true" />
-                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -53,13 +53,14 @@ import mixin from '@/mixins/mixin'
 // import Header from "@/components/headerNew";
 import Year from '../facilityManage/common-vue/year.vue'
 import {debounce} from '@/utils/common.js'
+import {dieoutMixin, modelValidatorMixin} from '@/mixins/dieoutMixin.js'
 export default {
     components: {
         // Header,
         VanPickerNew,
         Year
     },
-    mixins: [mixin],
+    mixins: [mixin, dieoutMixin, modelValidatorMixin],
     data() {
         return {
             title: '新增/修改',

src/views/enterprise/yearEnergyAddEdit.vue

@@ -117,6 +117,25 @@
                   <div class="tips" v-if="tips1">工业总产值>工业增产值</div>
                 </van-cell-group>
               </div>
+              <div class="title">
+                <div class="title-img"><img src="@/assets/u239.png" alt="" /></div>
+                <p>能源消耗折标量</p>
+              </div>
+              <div class="nengyuan">
+                <van-cell-group>
+                  <van-field
+                    v-for="(item, index) in switchDataList" :key="index"
+                    v-input.reset
+                    v-input.float
+                    :disabled="showForm"
+                    type="number"
+                    v-model="yearForm[item.prop]"
+                    :label="item.name"
+                    placeholder="请输入"
+                  />
+                  </van-cell-group>
+
+              </div>
           </div>
           <div class="year-main" v-if="tabName == 'b'">
               <van-cell
@@ -127,6 +146,16 @@
                 value-class="text-ellipsis"
                 style="border-radius: 8px"
               />
+              <div v-if="notUsedResidueEnergyName && notUsedResidueEnergyName.indexOf('其他') >= 0">
+              <van-field
+                v-input.reset
+                label="其他余能资源利用方式"
+                placeholder="请输入"
+                input-align="right"
+                required :rules="[{  required: true }]"
+                v-model="otherUseMethod"
+              ></van-field>
+              </div>
               <div class="title" style="margin-top: 12px; margin-left: 5px">
                 若存在尚未利用余热(高温气体、蒸汽 、热水)
               </div>
@@ -429,6 +458,14 @@ export default {
                 dieselValue: 0,
                 totalOutput: 0,
                 addOutput: 0,
+                switchPowerPurchase:0,
+                switchNaturalGas:0,
+                switchSteamPurchaseLow:0,
+                switchSteamPurchaseMid:0,
+                switchSteamPurchaseHig:0,
+                switchCoal:0,
+                switchGasoline:0,
+                switchDiesel:0,
                 energyUnutilizedVO: {
                     notUsedResidueEnergyType: '', // 尚未利用的余能资源
                     residueHotTemp: '', // 主要余热排放温度
@@ -456,7 +493,40 @@ export default {
             notHeatDemandName: '', // 企业非生产工艺用热需求名称显示
             heatDemandOtherName: '', // 企业生产工艺用热需求其他具体内容
             notHeatDemandOtherName: '', // 企业非生产工艺用热需求其他具体内容
+            otherUseMethod:'', // 其他余能资源利用方式
             doDebounce: null,
+            switchDataList:[
+              {
+                prop:'switchPowerPurchase',
+                name:'外购电 (tce)'
+              },
+              {
+                prop:'switchNaturalGas',
+                name:'天然气 (tce)'
+              },
+              {
+                prop:'switchSteamPurchaseLow',
+                name:'外购低压蒸汽 (tce)'
+              },
+              {
+                prop:'switchSteamPurchaseMid',
+                name:'外购中压蒸汽 (tce)'
+              },
+              {
+                prop:'switchSteamPurchaseHig',
+                name:'外购高压蒸汽 (tce)'
+              },
+              {
+                prop:'switchCoal',
+                name:'煤 (tce)'
+              },{
+                prop:'switchGasoline',
+                name:'汽油 (tce)'
+              },{
+                prop:'switchDiesel',
+                name:'柴油 (tce)'
+              },
+            ]
         };
     },
     watch: {
@@ -495,6 +565,14 @@ export default {
                 }
             },
             deep: true
+        },
+        'notUsedResidueEnergyName': {
+            handler(val) {
+                if(val.indexOf('其他') < 0) {
+                    this.otherUseMethod = ''
+                }
+            },
+            deep: true
         }
     },
     computed: {
@@ -616,6 +694,7 @@ export default {
                       this.notHeatDemandName = '', // 企业非生产工艺用热需求名称显示
                       this.heatDemandOtherName = '', // 企业生产工艺用热需求其他具体内容
                       this.notHeatDemandOtherName = '' // 企业非生产工艺用热需求其他具体内容
+                      this.otherUseMethod = ''
                     }
                 }
             } else if(this.type == 'residueHotTempOption') {
@@ -766,6 +845,9 @@ export default {
                 if(this.notHeatDemandOtherName) {
                   this.yearForm.energyUnutilizedVO.notHeatDemandOther = this.notHeatDemandOtherName
                 }
+                if(this.otherUseMethod) {
+                  this.yearForm.energyUnutilizedVO.otherUseMethod = this.otherUseMethod
+                }
               this.yearForm.energyUnutilizedVO = Object.assign( this.yearForm.energyUnutilizedVO ,this.customerInfo)
             }
             if(this.tabName == 'a'&&this.tips1){
@@ -859,6 +941,7 @@ export default {
                     }
                     this.heatDemandOtherName = this.yearForm.energyUnutilizedVO.heatDemandOther
                     this.notHeatDemandOtherName = this.yearForm.energyUnutilizedVO.notHeatDemandOther
+                    this.otherUseMethod = this.yearForm.energyUnutilizedVO.otherUseMethod
                 }
            } catch (error) {
                 this.show = false

src/views/facilityManage/bursting/burstingDetail.vue

@@ -1,33 +1,38 @@
 <template>
     <div class="list">
         <van-form ref="detailForm" @submit="handelClickSave">
-                <!-- <div class="list-upload" v-if="(type == 1||type == 2) && $store.getters.imageRecognition">
+                <div class="list-upload" v-if="(type == 1||type == 2) && $store.getters.imageRecognition">
                   <btn-uploader type="filePic" :value="filePic" @afterRead="afterRead" @delImg="delImg" @onUpload="onUpload" />
-                </div> -->
+                </div>
             <div class="container" v-if="type == 1">
                 <div class="inputStyle">
                     <van-cell-group>
                         <van-field v-model="formColumns.refrigeTypeName" label="机组类型" is-link readonly input-align="right" placeholder="请选择" required :rules="[{ required: true }]" @click="handelClickHeatingShow('jzlx', 80000001016,'refrigeTypeName','refrigeType','kt')"/>
-                        <van-field v-model="form.model" label="设备型号"  required :rules="[{  required: true },{pattern:/^.{2,30}$/, message:'2≤型号长度≤30'}]" input-align="right" maxlength="30" placeholder="请输入设备型号"/>
+                        <van-field @blur="checkEquipDieout('1', 'model', 'dieoutNum', 'form', 'refrigeNum')"  v-model="form.model" label="设备型号" :rules="[{ required: false, validator:modelValidator, message:'2≤型号长度≤30'}]" input-align="right" maxlength="30"/>
                         <van-field v-model="refrigeNum" v-input.numNo0 label="数量(台)" readonly type="number" required :rules="[{ required: true }]" input-align="right" placeholder="自动计算" />
                         <div class="tips" v-if="refrigeNum+''=='0'">数量>0</div>
-                        <van-field v-model="edgl" v-input.floatNo0 label="额定功率(kW)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                        <van-field v-model="edgl" v-input.floatNo0 label="总额定功率(kW)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
                         <div class="tips" v-if="ratio1">0＜额定功率＜1000</div>
                         <div class="tips" v-if="ratio">{{ refrigeTypeData[form.refrigeType][0]}} ≤额定制冷量/额定功率≤ {{refrigeTypeData[form.refrigeType][1]}}</div>
                         <van-field v-model="hyl" v-input.float label="耗用量(t或m3)" type="number" label-width="100" input-align="right" placeholder="请输入" />
                         <van-field v-model="form.coolCapacity" v-input.floatNo0 label="额定制冷量(kW)" required :rules="[{ required: true }]" type="number" input-align="right" placeholder="请输入" />
                         <div class="tips" v-if="ratio">{{ refrigeTypeData[form.refrigeType][0]}} ≤额定制冷量/额定功率≤ {{refrigeTypeData[form.refrigeType][1]}}</div>
-                        <van-field v-model="form.useExpl" v-input.num label="在用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
+                        <van-field @blur="changeData('1', 'model', 'dieoutNum', 'form', 'refrigeNum')" v-model="form.useExpl" v-input.num label="在用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
-                        <van-field v-model="form.backupExpl" v-input.num label="备用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
+                        <van-field @blur="changeData('1', 'model', 'dieoutNum', 'form', 'refrigeNum')" v-model="form.backupExpl" v-input.num label="备用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
-                        <van-field v-model="form.useYear"  label="设备投用年份" label-width="140" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
+                        <van-field v-model="form.useYear"  label="设备投用年份" label-width="140" :rules="[{ required: false }]" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
-                        <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                        <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number"  :rules="[{ required: false }]" input-align="right" placeholder="请输入" />
-                        <van-field v-model="form.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" :rules="[{ required: false }]" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field v-model="form.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" :rules="[{ required: false }]" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field v-model="form.coldPerArea" v-input.float label="单位面积冷量（kw/平方米）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form.coldPerArea" v-input.float label="单位面积冷量（kW/平方米）"  type="number" :rules="[{ required: false }]" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                        <van-field label="设备能效等级" v-model="form.equipEfficiencyName" :rules="[{  required: false }]" clearable placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                        <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
+                        <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" clearable placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
-                        <van-field v-input.num v-model="form.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
+                        <van-field v-input.num v-model="form.cumulativeRunHours" :rules="[{  required: false }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
-                        <van-field v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" label-width="200"  input-align="right"/>
+                        <van-field readonly v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" :rules="[{ required: false }]" label-width="200"  input-align="right"/>
+                        <van-field v-input.float v-model="form.saveElectricity" type="number" label="预期年节电量（千瓦时）" placeholder="请输入" label-width="220"  input-align="right"/>
+                        <van-field v-input.float v-model="form.carbonEmissionFactor" type="number" label="区域碳排放因子" placeholder="请输入" :rules="[{ required: false }]" label-width="200"  input-align="right"/>
+                        <van-field v-input.float v-model="form.carbonReduction" type="number" label="预期减碳量（TCO₂）" placeholder="请输入" :rules="[{ required: false }]" label-width="200"  input-align="right"/>
+                        <van-field v-input.float v-model="form.centralAirConditionerCop" type="number" label="集中式空调机组平均COP" placeholder="请输入" :rules="[{ required: false }]" label-width="200"  input-align="right"/>
+                        <van-field v-model="form.totalConcatenatedCold" v-input.float label="总额定制冷功率(kW)" type="number" input-align="right" placeholder="请输入"  label-width="200"  />
                       </van-cell-group>
                     <van-cell class="img-box box1" title="设备外观" :required="$store.getters.cityType"/>
                     <Uploader type="exteriorImage1" :value="exteriorImage1" @afterRead="afterRead1" @delImg="delImg1" @onUpload="onUpload1" />
@@ -51,24 +56,24 @@
                 <!-- 设备类型选择 -->
                 <div class="inputStyle">
                     <van-cell-group>
-                        <van-field v-model="formColumns.refrigeTypeName" label="设备类型1" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" @click="handelClickHeatingShow('jzlx', 80000001016,'refrigeTypeName','refrigeType','lqt' )" readonly />
+                        <van-field v-model="formColumns.refrigeTypeName" label="设备类型" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" @click="handelClickHeatingShow('jzlx', 80000001016,'refrigeTypeName','refrigeType','lqt' )" readonly />
                         <!-- <van-cell  title="设备类型" is-link :value="form.refrigeTypeName"  @click="showPicker = true" readonly /> -->
-                        <van-field v-model="form.model" label="设备型号"  required :rules="[{  required: true },{pattern:/^.{2,30}$/, message:'2≤型号长度≤30'}]" input-align="right" maxlength="30" placeholder="请输入设备型号"/>
+                        <van-field @blur="checkEquipDieout('1', 'model', 'dieoutNum', 'form', 'refrigeNum')"  v-model="form.model" label="设备型号"  :rules="[{ required: false, validator:modelValidator, message:'2≤型号长度≤30'}]"  input-align="right" maxlength="30" placeholder="请输入设备型号"/>
                         <van-field v-model="refrigeNum" v-input.numNo0 label="数量(台)" readonly type="number" required :rules="[{ required: true }]" input-align="right" placeholder="自动计算" />
                         <div class="tips" v-if="refrigeNum+''=='0'">数量>0</div>
                         <van-field v-model="form.ratedPower" v-input.floatNo0 label="额定功率(kW)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
                         <div class="tips" v-if="ratio2">0＜额定功率＜500</div>
-                        <van-field v-model="form.useExpl" v-input.num label="在用台数(台)" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                        <van-field @blur="changeData('1', 'model', 'dieoutNum', 'form', 'refrigeNum')" v-model="form.useExpl" v-input.num label="在用台数(台)" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
-                        <van-field v-model="form.backupExpl" v-input.num label="备用台数(台)" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                        <van-field @blur="changeData('1', 'model', 'dieoutNum', 'form', 'refrigeNum')" v-model="form.backupExpl" v-input.num label="备用台数(台)" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
-                        <van-field v-model="form.useYear" label="设备投用年份" label-width="140" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
+                        <van-field v-model="form.useYear" label="设备投用年份" label-width="140" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
-                        <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                        <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number" input-align="right" placeholder="请输入" />
-                        <van-field v-model="form.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field v-model="form.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field v-model="form.coldPerArea" v-input.float label="单位面积冷量（kw/平方米）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form.coldPerArea" v-input.float label="单位面积冷量（kW/平方米）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                        <van-field label="设备能效等级" v-model="form.equipEfficiencyName" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                         <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
-                        <van-field v-input.num v-model="form.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
+                        <van-field v-input.num v-model="form.cumulativeRunHours" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
-                        <van-field v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" label-width="200"  input-align="right"/>
+                        <van-field readonly v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" label-width="200"  input-align="right"/>
                       </van-cell-group>
                     <van-cell class="img-box box1" title="设备外观"  :required="$store.getters.cityType"/>
                     <Uploader type="exteriorImage1" :value="exteriorImage1" @afterRead="afterRead1" @delImg="delImg1" @onUpload="onUpload1" />
@@ -87,23 +92,27 @@
                 <div class="inputStyle">
                     <van-cell-group>
                         <van-field v-model="formColumns.refrigeTypeName" label="机组类型" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" @click="handelClickHeatingShow('jzlx',80000001020,'refrigeTypeName','refrigeType')" readonly />
-                        <van-field v-model="form1.model" label="设备型号"  required :rules="[{  required: true },{pattern:/^.{2,30}$/, message:'2≤型号长度≤30'}]" input-align="right" maxlength="30" placeholder="请输入设备型号"/>
+                        <van-field @blur="checkEquipDieout('2', 'model', 'dieoutNum', 'form1', 'heatNum')"  v-model="form1.model" label="设备型号" :rules="[{ required: false, validator:modelValidator, message:'2≤型号长度≤30'}]"  input-align="right" maxlength="30" placeholder="请输入设备型号"/>
                         <van-field v-model="heatNum" v-input.numNo0 label="数量(台)" readonly type="number" required :rules="[{ required: true }]" input-align="right" placeholder="自动计算" />
                         <div class="tips" v-if="heatNum+''=='0'">数量>0</div>
                         <van-field @input="changeTips" v-model="edgl" v-input.floatNo0 label="额定功率(kW)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
-                        <van-field v-model="hyl" v-input.floatNo0 label="耗用量(t或m3)" type="number" label-width="100" input-align="right" placeholder="请输入" />
+                        <van-field v-model="hyl" v-input.floatNo0 label="耗用量(t或m3)" type="number" required :rules="[{ required: true }]"  label-width="100" input-align="right" placeholder="请输入" />
                         <van-field @input="changeTips" v-model="form1.heatCapacity" v-input.floatNo0 label="额定制热量(kW)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
-                        <van-field v-model="form1.useExpl" v-input.num type="number" label="在用台数(台)" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                        <van-field @blur="changeData('2', 'model', 'dieoutNum', 'form1', 'heatNum')" v-model="form1.useExpl" v-input.num type="number" label="在用台数(台)" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
-                        <van-field v-model="form1.backupExpl" v-input.num type="number" label="备用台数(台)" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                        <van-field @blur="changeData('2', 'model', 'dieoutNum', 'form1', 'heatNum')" v-model="form1.backupExpl" v-input.num type="number" label="备用台数(台)" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
-                        <van-field v-model="form1.useYear" label="设备投用年份" label-width="140" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
+                        <van-field v-model="form1.useYear" label="设备投用年份" label-width="140" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
-                        <van-field v-model="form1.loadFactor" v-input.float label="负载系数"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                        <van-field v-model="form1.loadFactor" v-input.float label="负载系数"  type="number" input-align="right" placeholder="请输入" />
-                        <van-field v-model="form1.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form1.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field v-model="form1.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form1.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field v-model="form1.heatPerArea" v-input.float label="单位面积热量（kw/平方米）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                        <van-field v-model="form1.heatPerArea" v-input.float label="单位面积热量（kW/平方米）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                        <van-field label="设备能效等级" v-model="form1.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                        <van-field label="设备能效等级" v-model="form1.equipEfficiencyName" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                         <van-field label="设备生产日期" v-model="form1.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
-                        <van-field v-input.num v-model="form1.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
+                        <van-field v-input.num v-model="form1.cumulativeRunHours" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
-                        <van-field v-input.num v-model="form1.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" label-width="200"  input-align="right"/>
+                        <van-field readonly  v-model="form1.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" label-width="200"  input-align="right"/>
+                        <van-field v-input.float v-model="form1.saveElectricity" type="number" label="预期年节电量（千瓦时）" placeholder="请输入" label-width="220"  input-align="right"/>
+                        <van-field v-input.float v-model="form1.carbonEmissionFactor" type="number" label="区域碳排放因子" placeholder="请输入" label-width="200"  input-align="right"/>
+                        <van-field v-input.float v-model="form1.carbonReduction" type="number" label="预期减碳量（TCO₂）" placeholder="请输入" label-width="200"  input-align="right"/>
+                      
                       </van-cell-group>
                     <van-cell class="img-box box1" title="设备外观"  :required="$store.getters.cityType"/>
                     <Uploader type="exteriorImage1" :value="exteriorImage1" @afterRead="afterRead1" @delImg="delImg1" @onUpload="onUpload1" />
@@ -144,6 +153,7 @@ import { pureDigital } from '../pattern'
 import VanPickerNew from "@/components/vanPickerNew";
 import Year from "../common-vue/year.vue";
 import mixin from "@/mixins/mixin";
+import {dieoutMixin} from '@/mixins/dieoutMixin'
 import { downloadUrl } from "@/settings";
 import Uploader from "../common-vue/uploader.vue";
 import btnUploader from "../common-vue/btnUploader.vue";
@@ -157,7 +167,7 @@ export default {
         // Header,
         VanPickerNew,
     },
-    mixins: [mixin],
+    mixins: [mixin, dieoutMixin],
 
     computed: {
         pureDigital() {
@@ -198,8 +208,18 @@ export default {
 
         
     },
+    
     data() {
+      const modelValidator = ( value, rule) => {
+        if(value){
+          return /^.{2,30}$/.test(value)
+        }
+        if(!rule.required){
+          return true
+        }
+      }
         return {
+          modelValidator,
             tips0: false,
             exteriorImage1: [], //设备外观
             tagImage1: [], //设备铭牌
@@ -227,6 +247,7 @@ export default {
                 refrigeNum: "",
                 ratedPower: "",
                 coolCapacity: "",
+                totalConcatenatedCold: '',
                 useExpl: "",
                 backupExpl: "",
                 useYear: "",
@@ -240,7 +261,11 @@ export default {
                 equipEfficiency: '',
                 produceDate:'',
                 cumulativeRunHours: '',
-                dieoutNum: ''
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+                centralAirConditionerCop:'',
             },
             form1: {
                 equipId:'',
@@ -264,7 +289,10 @@ export default {
                 equipEfficiency: '',
                 produceDate:'',
                 cumulativeRunHours: '',
-                dieoutNum: ''
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
             },
             formColumns: {
                 refrigeType: "",
@@ -862,12 +890,25 @@ export default {
                 refrigeNum: "",
                 ratedPower: "",
                 coolCapacity: "",
+                totalConcatenatedCold: '',
                 useExpl: "",
                 backupExpl: "",
                 useYear: "",
                 exteriorImage: "", //设备外观
                 tagImage: "", //设备铭牌
                 markImage: "", //设备能效标识
+                loadFactor: '',
+                runHours:'',
+                runDays: '',
+                coldPerArea: '',
+                equipEfficiency: '',
+                produceDate:'',
+                cumulativeRunHours: '',
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+                centralAirConditionerCop:'',
             };
             this.form1 = {
                 equipId:'',
@@ -882,6 +923,17 @@ export default {
                 exteriorImage: "", //设备外观
                 tagImage: "", //设备铭牌
                 markImage: "", //设备能效标识
+                loadFactor: '',
+                runHours:'',
+                runDays: '',
+                heatPerArea: '',
+                equipEfficiency: '',
+                produceDate:'',
+                cumulativeRunHours: '',
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
             };
             this.formColumns = {
                 refrigeType: "",

src/views/facilityManage/components/distributionSystem.vue

@@ -18,17 +18,19 @@
                 <van-field v-input.numNo0 v-show="s8show" v-model="form.s8Num" label="变压器S8台数" type="number" required :rules="[{ required: s8show, message:'请输入变压器S8台数' }]" label-width="140" input-align="right" placeholder="请输入" />
                 <van-field v-input.numNo0 v-show="s7show" v-model="form.s7BelowNum" label="变压器S7及以下台数" type="number" required :rules="[{ required: s7show, message:'请输入变压器S7及以下台数' }]" label-width="180" input-align="right" placeholder="请输入" />
                 <van-field v-input.numNo0 v-show="othershow" v-model="form.otherNum" label="其他变压器数量" type="number" required :rules="[{ required: othershow, message:'请输入其他变压器数量' }]" label-width="140" input-align="right" placeholder="请输入" />
-                <van-field v-model="form.useYear" required :rules="[{ required: true, message:'请选择变压器最早投运年限' }]" label="变压器最早投运年限(年)" label-width="140" input-align="right" placeholder="请输入" is-link readonly @click="handelClickYear('useYear')" />
+                <van-field v-model="form.useYear" label="变压器最早投运年限(年)" label-width="140" input-align="right" placeholder="请输入" is-link readonly @click="handelClickYear('useYear')" />
-                <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" input-align="right" label-width="140" placeholder="请选择设备能效等级" is-link readonly @click="handelClickOptionShow('equipEfficiency')" />
+                <van-field label="设备能效等级" v-model="form.equipEfficiencyName" input-align="right" label-width="140" placeholder="请选择设备能效等级" is-link readonly @click="handelClickOptionShow('equipEfficiency')" />
                 <van-field label="变压器生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择变压器生产日期" label-width="140" input-align="right" is-link  readonly @click="datePicker = true" />
-                <van-field v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" label-width="200"  input-align="right"/>
+                <van-field v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" label-width="200"  input-align="right"/>
                 
                 <van-field v-input.numNo0 v-model="form.distributeCapacity" label="总额定容量(kVA)" type="number" name="distributeCapacity" required :rules="[{ required: true, message:'请填写总额定容量' }]" label-width="100" input-align="right" placeholder="请输入" />
     
                 <van-field v-input.float v-model="form.maxNeed" required :rules="[{ required: true}]" label="最大需量(kW)" type="number" input-align="right" placeholder="请输入" @input="changeTips" />
                 <div class="tips" v-if="tips0">最大需量≤总额定容量</div>
                 <van-field v-input.allFloat v-model="form.penaltyAmount" required :rules="[{ required: true}]" label="上一年累计度力调电费的惩罚金额（元）" type="number" label-width="220" input-align="right" placeholder="请输入" />
-    
+                <van-field v-input.float v-model="form.saveElectricity" type="number" label="预期年节电量（千瓦时）" placeholder="请输入" label-width="220"  input-align="right"/>
+                <van-field v-input.float v-model="form.carbonEmissionFactor" type="number" label="区域碳排放因子" placeholder="请输入" label-width="200"  input-align="right"/>
+                <van-field v-input.float v-model="form.carbonReduction" type="number" label="预期减碳量（TCO₂）" placeholder="请输入" label-width="200"  input-align="right"/>
                 <Whether :value="formColumns.chargingName" feildName="charging" title="是否安装新能源充电桩" @onConfirmTrueFalse="onConfirmTrueFalse" />
 
                 <van-field v-show="form.charging == 1" v-model="formColumns.deviceTypeName" label="设备类型" required :rules="[{ required: form.charging == 1, message:'请选择设备类型' }]"  is-link input-align="right" placeholder="请输入" readonly @click="deviceTypeShow = true" />
@@ -259,6 +261,9 @@ export default {
                 produceDate:'',
                 equipEfficiency: '',
                 dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
             },
             //页面展示的中文名称
             formColumns: {

src/views/facilityManage/components/fissionAir.vue

@@ -3,33 +3,62 @@
           <div class="fissionItem">
               <van-cell-group>
                   <van-field v-model="form.refrigeNum" v-input.numNo0 label="空调数量"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
-                  <van-field v-model="form.dieoutNum" v-input.num label="淘汰设备数量"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                  <van-field @blur="checkEquipDieout('9', 'model', 'dieoutNum', 'form', 'refrigeNum')"  v-model="form.model" label="设备型号" :rules="[{ required: false, validator:modelValidator, message:'2≤型号长度≤30'}]" input-align="right" maxlength="30"/>
-                  <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                  <van-field v-model="form.dieoutNum" v-input.num label="淘汰设备数量"  type="number" input-align="right" placeholder="请输入" />
-                  <van-field v-model="form.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                  <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number" input-align="right" placeholder="请输入" />
-                  <van-field v-model="form.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                  <van-field v-model="form.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                  <van-field v-model="form.coldPerArea" v-input.float label="单位面积冷量（kw/平方米）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                  <van-field v-model="form.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                  <!-- <van-field v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" label-width="200"  input-align="right"/> -->
+                  <van-field v-model="form.coldPerArea" v-input.float label="单位面积冷量（kW/平方米）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
+                  <van-field v-input.float v-model="form.saveElectricity" type="number" label="预期年节电量（千瓦时）" placeholder="请输入" label-width="220"  input-align="right"/>
+                  <van-field v-input.float v-model="form.carbonEmissionFactor" type="number" label="区域碳排放因子" placeholder="请输入" label-width="200"  input-align="right"/>
+                  <van-field v-input.float v-model="form.carbonReduction" type="number" label="预期减碳量（TCO₂）" placeholder="请输入" label-width="200"  input-align="right"/>
+                  <van-field v-model="form.totalConcatenatedCold" v-input.float label="总额定制冷功率(kW)" type="number" label-width="220" input-align="right" placeholder="请输入" />
+                  <van-field label="设备生产日期" v-model="form.produceDate" placeholder="请选择设备生产日期" label-width="140" input-align="right" is-link  readonly @click="datePicker = true" />
+                  <van-field label="设备能效等级" v-model="form.equipEfficiencyName"  placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                  <van-field v-input.num v-model="form.cumulativeRunHours"  type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
+                      <!-- <van-field v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" label-width="200"  input-align="right"/> -->
               </van-cell-group>
           </div>
           <!-- <div class="bottom"><van-button type="primary" block>保存</van-button></div> -->
+        <!-- 年份选择 -->
+        <VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
+        <van-popup v-model="datePicker" position="bottom">
+            <van-datetime-picker v-model="currentDate" type="date" :min-date="minDate"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
       </div>
 </template>
 
 <script>
 import { pureDigital } from '../pattern'
+import mixin from '@/mixins/mixin'
+import VanPickerNew from '@/components/vanPickerNew'
+import {dieoutMixin, modelValidatorMixin} from '@/mixins/dieoutMixin'
 
 export default {
+    components: {
+      VanPickerNew,
+    },
+    mixins: [mixin, dieoutMixin, modelValidatorMixin],
     data() {
         return {
             typeId: this.$route.query.typeId, 
             form: {
                 refrigeType:9,
                 refrigeNum: '',
+                totalConcatenatedCold: '',
                 loadFactor: '',
                 runHours:'',
                 runDays: '',
                 coldPerArea: '',
-                dieoutNum: ''
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+                model: '',
+                produceDate: '',
+                equipEfficiency: '',
+                equipEfficiencyName: '',
+                cumulativeRunHours: '',
             },
             eqid: '',
 
@@ -76,6 +105,8 @@ export default {
                         }
                       }
                     }
+                    let Efficiency = this.form.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == this.form.equipEfficiency)
+                    this.form.equipEfficiencyName = Efficiency&&Efficiency.text
                 }
             }
         },

src/views/facilityManage/components/hotWaterSystem.vue

@@ -10,7 +10,7 @@
                   <div class="tips" v-if="tips0 == true">35℃ ≤设定水温≤100℃</div>
                   <!-- <van-field v-model="form.useYear" label="变压器投运年限(年)" label-width="140" input-align="right" placeholder="请输入" is-link readonly @click="handelClickYear('useYear')" /> -->
                   <van-field v-model="formColumns.deviceTypeName" label="热水设备类型" required :rules="[{ required: true, message:'请选择热水设备类型' }]" input-align="right" placeholder="请选择" readonly is-link @click="deviceTypeShow = !showForm" />
-                  <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                  <van-field label="设备能效等级" v-model="form.equipEfficiencyName" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                   <!-- 是否进行过设备改造 -->
                   <Whether required :rules="[{ required: true, message:'请选择设备改造' }]" :value="formColumns.waterModiyName" @onConfirmTrueFalse="onConfirmTrueFalse" feildName="waterModiy" special="1" />
                   <!-- 改造方式 -->

src/views/facilityManage/components/multipleAir.vue

@@ -1,21 +1,21 @@
 <template>
     <div class="multipleAir">
-            <!-- <div class="list-upload"  v-if="$store.getters.imageRecognition">
+            <div class="list-upload"  v-if="$store.getters.imageRecognition">
               <btnUploader type="filePic" :value="filePic" 
                 @afterRead="afterRead1" 
                 @delImg="delImg1" 
                 @onUpload="onUpload1" />
-            </div> -->
+            </div>
           <div class="focusItem">
               <div class="inputStyle">
                   <van-cell-group>
-                      <van-field v-model="form.model" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" maxlength="20" label="型号"  label-width="120" input-align="right" placeholder="请输入型号"/>
+                      <van-field @blur="checkEquipDieout('8', 'model', 'dieoutNum', 'form', 'refrigeNum')" v-model="form.model" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" maxlength="20" label="型号"  label-width="120" input-align="right" placeholder="请输入型号"/>
                       <van-field v-model="form.refrigeNum" v-input.numNo0 label="空调数量" type="number" required :rules="[{ required: true}]" input-align="right" placeholder="请输入" />
                         <van-field v-model="edgl" v-input.floatNo0 label="总额定功率(kW)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
                         <div class="tips" v-if="ratio">{{validateData[0]}}≤额定制冷量/额定功率≤{{validateData[1]}}</div>
                         <van-field v-model="hyl" v-input.float label="耗用量(t或m3)" type="number" label-width="100" input-align="right" placeholder="请输入" />
                         <van-field v-model="form.coolCapacity" v-input.floatNo0 label="总额定制冷量(kW)" type="number" required :rules="[{ required: true}]" label-width="120" input-align="right" placeholder="请输入" />
-                      <van-field v-model="form.useYear" label="设备最早投入使用年份" required :rules="[{ required: true, message: '请选择投入年份' }]" label-width="150" is-link input-align="right" placeholder="请输入" readonly @click="handelClickYear('useYear', 'SET_CON_YEAR')" />
+                      <van-field v-model="form.useYear" label="设备最早投入使用年份" label-width="150" is-link input-align="right" placeholder="请输入" readonly @click="handelClickYear('useYear', 'SET_CON_YEAR')" />
                       <!-- 是否进行过设备改造 -->
                       <Whether required :rules="[{ required: true, message:'请选择设备改造' }]" :value="formColumns.conEquipModiyName" @onConfirmTrueFalse="onConfirmTrueFalse" feildName="conEquipModiy" special="1" />
                       <!-- 改造方式 -->
@@ -33,16 +33,21 @@
                       />
                       <van-field v-show="conYear1" v-model="form.conIntellectModifyYear" label="增加主机智能化集中控制系统年份" required :rules="[{ required: conYear1, message:'请选择年份' }]"  label-width="220" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('conIntellectModifyYear', 'SET_CON_YEAR')" />
                       <van-field v-show="conYear2" v-model="form.conModifyYear" label="更换高能效设备年份" required :rules="[{ required: conYear2, message:'请选择年份' }]"   label-width="140" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('conModifyYear', 'SET_CON_YEAR')" />
-                      <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                      <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number" input-align="right" placeholder="请输入" />
-                      <van-field v-model="form.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                      <van-field v-model="form.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                      <van-field v-model="form.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                      <van-field v-model="form.runDays" v-input.maxYearDay label="年平均运行时间（天）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
-                      <van-field v-model="form.coldPerArea" v-input.float label="单位面积冷量（kw/平方米）"  type="number" required :rules="[{ required: true }]" label-width="220"  input-align="right" placeholder="请输入" />
+                      <van-field v-model="form.coldPerArea" v-input.float label="单位面积冷量（kW/平方米）"  type="number" label-width="220"  input-align="right" placeholder="请输入" />
                       <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" label-width="140" input-align="right" is-link  readonly @click="datePicker = true" />
-                      <van-field v-model="form.useExpl" v-input.num label="在用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
+                      <van-field @blur="changeData('8', 'model', 'dieoutNum', 'form', 'refrigeNum')" v-model="form.useExpl" v-input.num label="在用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
-                      <van-field v-model="form.backupExpl" v-input.num label="备用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
+                      <van-field @blur="changeData('8', 'model', 'dieoutNum', 'form', 'refrigeNum')" v-model="form.backupExpl" v-input.num label="备用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
-                      <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                      <van-field label="设备能效等级" v-model="form.equipEfficiencyName"  placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                      <van-field v-input.num v-model="form.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
+                      <van-field v-input.num v-model="form.cumulativeRunHours"  type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
-                      <van-field v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" label-width="200"  input-align="right"/>
+                      <van-field readonly v-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入"  label-width="200"  input-align="right"/>
+                      <van-field v-input.float v-model="form.saveElectricity" type="number" label="预期年节电量（千瓦时）" placeholder="请输入" label-width="220"  input-align="right"/>
+                      <van-field v-input.float v-model="form.carbonEmissionFactor" type="number" label="区域碳排放因子" placeholder="请输入"  label-width="200"  input-align="right"/>
+                      <van-field v-input.float v-model="form.carbonReduction" type="number" label="预期减碳量（TCO₂）" placeholder="请输入"  label-width="200"  input-align="right"/>
+                      <van-field v-input.float v-model="form.multiAirConditionerCop" type="number" label="多联式空调机组平均COP" placeholder="请输入"  label-width="200"  input-align="right"/>
+                      <van-field v-model="form.totalConcatenatedCold" v-input.float label="总额定制冷功率(kW)" type="number" input-align="right" placeholder="请输入"  label-width="200"   />
                     </van-cell-group>
                   <div v-if="form.refrigeNum">
                     <van-cell class="img-box box1" style="padding:10px 15px;" title="设备外观" :required="$store.getters.cityType"/>
@@ -127,6 +132,7 @@ import ModifyMode from '../common-vue/modifyMode.vue'
 import Whether from '../common-vue/whether.vue'
 import Year from '../common-vue/year.vue'
 import mixin from '@/mixins/mixin'
+import {dieoutMixin, modelValidatorMixin} from '@/mixins/dieoutMixin'
 import Uploader from '../common-vue/uploader.vue'
 import Radio from '../common-vue/radio.vue'
 import { dataMode } from '../common'
@@ -144,7 +150,7 @@ export default {
         VanPickerNew,
         btnUploader
     },
-    mixins: [mixin],
+    mixins: [mixin, dieoutMixin, modelValidatorMixin],
 
     data() {
         return {
@@ -165,6 +171,7 @@ export default {
                 ratedPower: "",
                 refrigeNum: '', //空调数量
                 coolCapacity: '', //总额定制冷量
+                totalConcatenatedCold: '',
                 useYear: '', //设备最早投入使用年份
                 refrigeType: 8,
                 conIntellectModifyYear: '', //增加主机智能化集中控制系统年份
@@ -181,7 +188,12 @@ export default {
                 equipEfficiency: '',
                 cumulativeRunHours: '',
                 produceDate:'',
-                dieoutNum: ''
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+                multiAirConditionerCop:'',
+
             },
 
             /**

src/views/industrialReport/components/electro.vue

@@ -150,6 +150,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='fullreport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         if (res.code == 0) {
           localStorage.setItem('reportCustomerId', res.data.customerId)

src/views/industrialReport/components/managementlevel.vue

@@ -146,6 +146,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='fullreport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         if (res.code == 0) {
           localStorage.setItem('reportCustomerId', res.data.customerId)

src/views/industrialReport/components/refrom.vue

@@ -74,6 +74,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='fullreport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         if (res.code == 0) {
           localStorage.setItem('reportCustomerId', res.data.customerId)

src/views/industrialReport/components/universal.vue

@@ -165,6 +165,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='fullreport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         if (res.code == 0) {
           localStorage.setItem('reportCustomerId', res.data.customerId)

src/views/industrialReport/components/utilize.vue

@@ -184,6 +184,10 @@ export default {
     async getLoginCustomer() {
       this.loading2 = true
       try {
+        let reportCustomerId = localStorage.getItem('reportCustomerId')
+        if(reportCustomerId&&this.$route.name=='fullreport'){
+          return
+        }
         const res = await getLoginCustomerAPI()
         if (res.code == 0) {
           localStorage.setItem('reportCustomerId', res.data.customerId)

src/views/industrialReport/fullreport.vue

@@ -300,6 +300,7 @@ export default {
         const res = await getLoginCustomerAPI()
         // console.log(res.data.customerId);
         if (res.code == 0) {
+          localStorage.setItem('reportCustomerId', res.data.customerId)
           const data = {
             customerId: res.data.customerId, 
             ai: sessionStorage.getItem('saikey')
@@ -324,20 +325,6 @@ export default {
           sessionStorage.setItem('signIdtwo', res.data.id)
           this.EnergyReportInfo = res.data
           this.setEnergyReportInfo(res.data)
-          if (res.data.energySituationRadar) {
-            this.radarOption.radar.indicator = JSON.parse(
-              res.data.energySituationRadar
-            )['indicator']
-            this.radarOption.series[0].data = []
-            this.radarOption.series[0].data.push(
-              JSON.parse(res.data.energySituationRadar)['seriesData'][0].dataList
-            )
-            this.createRadarChart()
-          } else {
-            this.radarOption.radar.indicator = []
-            this.radarOption.series[0].data = []
-            this.createRadarChart()
-          }
         } else {
             Notify({ type: 'danger', message: res.msg })
         }

src/views/industrialReport/partialReport.vue

@@ -31,9 +31,12 @@
               <van-dropdown-item v-model="value1" :options="option1" />
             </van-dropdown-menu> -->
             
-            <div class="detail2-right-top-reset"  @click="generateReport" v-if="isLevel">
+            <div class="detail2-right-top-reset"  @click="generateReport(false)" v-if="isLevel">
               重新生成
             </div> 
+            <div class="detail2-right-top-reset"  @click="generateReport(true)" v-if="isLevel&&isCq">
+              刷新
+            </div>
           </div>
           <div class="detail2-right-bottom">
             {{userCode}}: <div>{{ EnergyReportInfo.consNo }}</div>
@@ -237,6 +240,9 @@ export default {
 
     taskType() {
       return this.$route.params.item? this.$route.params.item.taskType: 0
+    },
+    isCq(){
+      return  process.env.VUE_APP_CITY_TYPE=='cq'
     }
   },
   beforeRouteEnter(to, from, next) {
@@ -252,8 +258,8 @@ export default {
   // },
   created() {
     this.userLevel()
-    this.doDebounce = debounce(function () {
+    this.doDebounce = debounce(function (flag) {
-      this.getGenerateReport()
+      this.getGenerateReport(flag)
     }, 5000, true)
   },
   mounted() {
@@ -436,14 +442,15 @@ export default {
       this.option1 = arr
     },
     // 重新生成
-    generateReport(){
+    generateReport(flag){
-      this.doDebounce()
+      this.doDebounce(flag)
     },
-    async getGenerateReport() {
+    async getGenerateReport(flag) {
       let data = {
         customerId:
           this.$route.params.customerId || JSON.parse(sessionStorage.getItem('tidCid')).customerId,
-        taskId: this.$route.params.taskId|| JSON.parse(sessionStorage.getItem('tidCid')).taskId
+        taskId: this.$route.params.taskId|| JSON.parse(sessionStorage.getItem('tidCid')).taskId,
+        refresh: flag
       }
       // this.$toast('正在重新生成,请稍后...')
       this.$toast.loading({

vue.config.js

@@ -133,14 +133,14 @@ module.exports = {
       
       "/admin": {
         //  target: "http://121.28.84.19:9004",
-          target: "http://172.29.69.38:19012",
+          target: "http://172.29.106.250:19012",
            changeOrigin: true,
            pathRewrite: {
              "^/admin": "",
            },
          },  "/energy-effcicency-net-service": {
           //  target: "http://121.28.84.19:9004",
-            target: "http://172.29.69.38:19012",
+            target: "http://172.29.106.250:19012",
              changeOrigin: true,
              pathRewrite: {
                "^/energy-effcicency-net-service": "",