填报增加字段

.env.production

@@ -6,7 +6,7 @@ NODE_ENV=production
 # 测试0 生产1
 VUE_APP_ENV = '1'
 # 定义变量
-VUE_APP_CITY_TYPE = 'cq'
+VUE_APP_CITY_TYPE = 'ah'
 
 # base api
 VUE_APP_BASE_API = ''

src/api/common.js

@@ -29,6 +29,16 @@ export function getOrgList() {
   })
 }
 
+// 地区公司
+export function cityTree(data) {
+  return myAxios({
+    url: `${sx}/energy-effcicency-net-service/nxzdPCodeYcControllerNet/cityTree`, //后端接口路由
+    method: 'post',
+    data
+  })
+}
+
+
 //获取用户信息
 export function getUserInfo(params) {
   return myAxios({

src/api/config.js

@@ -10,11 +10,11 @@ if (process.env.NODE_ENV === 'development') {
 } else {
   // 生产环境
   // baseURL = '' // 本地 打包以后只需要空路径就行
-  // baseURL = '/proxy-ah' //安徽 打包以后的路径
+  baseURL = '/proxy-ah' //安徽 打包以后的路径
   // baseURL = '/proxy-nx' //宁夏 打包以后的路径
   // baseURL = '/proxy-xj' //新疆 打包以后的路径
   // baseURL = '/proxy-sx' //山西 打包以后的路径
-  baseURL = '/proxy-cq' //重庆 打包以后的路径
+  // baseURL = '/proxy-cq' //重庆 打包以后的路径
 }
 
 

src/api/energyConsumption.js

@@ -2,13 +2,7 @@ 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,12 +264,3 @@ 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

@@ -1,65 +0,0 @@
-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/settings.js

@@ -10,7 +10,7 @@ module.exports = {
    */
   sidebarLogo: true,
   menuExclude: [],
-  downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-cq/file/minio/download/`,
+  downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-ah/file/minio/download/`,
   uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`,
   statusCode: {
     SUCCESS: 0

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'||process.env.VUE_APP_CITY_TYPE=='cq', // 安徽、重庆有图像识别
+  imageRecognition: process.env.VUE_APP_CITY_TYPE=='ah', // 图像识别
   validate: process.env.VUE_APP_CITY_TYPE=='ah', // 大区间校验 任务列表 用户客户标识
   cityisXj: process.env.VUE_APP_CITY_TYPE=='xj', // 报告-二氧化碳系数
 })

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,9 +230,7 @@
           EnergyReportInfo.heatRatedPower
         }}（吨/立方米/千瓦），总制热量为{{
           EnergyReportInfo.heatCapacity
-        }}千瓦，
+        }}千瓦，机组最长投运年限为{{ EnergyReportInfo.heatUnitMinUseYear }}年。
-        机组平均能效比为{{(EnergyReportInfo.heatRatedPower/EnergyReportInfo.heatCapacity).toFixed(2)}}（总制热量/总功率），
-        机组最长投运年限为{{ EnergyReportInfo.heatUnitMinUseYear }}年。
         </span>
 
         采暖泵合计{{ EnergyReportInfo.heatPumpNum}}台，总额定功率为{{

src/views/energyEfficiency/archivalInformation.vue

@@ -43,30 +43,29 @@
                   disabled
                 />
 
-                <!-- 所属区域 -->
+                <!-- 供电公司 -->
+
+                <van-field
+                  v-model="powerCompanyName"
+                  readonly
+                  required
+                  label="供电公司"
+                  placeholder="请输入"
+                  disabled
+                />
+
+                <!-- 区县公司 -->
 
                 <van-field
                   v-model="provOrgName"
                   is-link
                   readonly
                   required
-                  label="所属区域"
+                  label="区县公司"
                   placeholder="请选择"
                   @click="provOrgNoShow = true"
                 />
 
-                <!-- 供电公司 -->
-
-                <van-field
-                  v-model="powerCompanyName"
-                  is-link
-                  readonly
-                  required
-                  label="供电公司"
-                  placeholder="请选择"
-                  @click="handelClickPowerCompany"
-                />
-
                 <!-- 社会信用代码 -->
 
                 <van-field
@@ -195,12 +194,12 @@
           @finish="onFinish"
         />
       </van-popup>
-      <!-- 所属区域 -->
+      <!-- 区县公司 -->
       <van-popup v-model="provOrgNoShow" round position="bottom">
         <van-cascader
           :field-names="orgFieldNames"
           v-model="customer.provOrgNo"
-          title="请选择所属区域"
+          title="请选择区县公司"
           :options="provOrgList"
           :props="backList"
           @close="provOrgNoShow = false"
@@ -209,7 +208,7 @@
         />
       </van-popup>
       <!-- 供电公司 -->
-      <van-popup v-model="powerCompanyShow" round position="bottom">
+      <!-- <van-popup v-model="powerCompanyShow" round position="bottom">
         <van-picker
           v-model="customer.powerCompany"
           show-toolbar
@@ -217,7 +216,7 @@
           @cancel="powerCompanyShow = false"
           @confirm="onConfirmPowerCompanyShow"
         />
-      </van-popup>
+      </van-popup> -->
 
       <van-popup v-model="yearShow" round position="bottom">
         <van-datetime-picker
@@ -273,7 +272,7 @@
 <script>
 // import Header from "@/components/headerNew";
 import { Notify } from 'vant'
-import { getCode, getOrgList } from '@/api/common.js'
+import { getCode, cityTree } from '@/api/common.js'
 import { customerEdit, getSingleInfo } from '@/api/customer.js'
 import Loading from '@/components/loading'
 import VanPickerNew from '@/components/vanPickerNew'
@@ -386,7 +385,7 @@ export default {
         value: 'code',
         children: 'child',
       },
-      //自定义所属区域字段名称
+      //自定义区县公司字段名称
       orgFieldNames: {
         text: 'codeName',
         pCode: 'pcodeValue',
@@ -400,11 +399,11 @@ export default {
       customerTypeShow: false,
       //客户类型弹框数据
       customerTypeList: [],
-      //所属区域中文展示
+      //区县公司中文展示
       provOrgName: '',
-      //所属区域弹框展示
+      //区县公司弹框展示
       provOrgNoShow: false,
-      //所属区域弹框数据
+      //区县公司弹框数据
       provOrgList: [],
       //错误提示
       errorMessage: '',
@@ -426,7 +425,7 @@ export default {
   },
   created() {
     this.getOrg()
-    this.powerList()
+    // this.powerList()
   },
   mounted() {
     this.getPersonData()
@@ -565,8 +564,8 @@ export default {
           this.customer = res.data
           this.customer.customerType = res.data.customerType
           this.customer.consNo = res.data.consNo
-          this.customer.provOrgNo = res.data.orgNo
+          this.customer.provOrgNo = res.data.consOrgNo
-          this.provOrgName = res.data.orgName
+          this.provOrgName = res.data.consOrgName
           this.customer.powerCompany = res.data.powerCompany
           this.getCustomerType()
           this.powerList()
@@ -619,7 +618,7 @@ export default {
     },
     //查询地区
     async getOrg() {
-      const res = await getOrgList()
+      const res = await cityTree()
       if (res.code === 0) {
         this.provOrgList = res.data
         this.backList = res.data
@@ -646,9 +645,11 @@ export default {
     },
     async onFinish1({ selectedOptions }) {
       const data = await this.getCheckboxInfo(selectedOptions)
-      this.customer.orgNo = data.codeValue
+      this.customer.consOrgNo = data.codeValue
       this.customer.provOrgNo = data.codeValue
       this.customer.provinceNo = selectedOptions[0].codeValue
+      this.customer.powerCompany = selectedOptions[0].codeValue
+      this.powerCompanyName = selectedOptions[0].codeName
       this.provOrgName = data.codeName
       this.provOrgNoShow = false
     },
@@ -704,7 +705,7 @@ export default {
     },
     //客户类型点击确认
     customerTypeSure() {},
-    //所属区域点击确认
+    //区县公司点击确认
     provOrgSure() {},
   },
 }

src/views/energyEfficiency/constructionInfo.vue

@@ -13,13 +13,12 @@
                                   <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>
@@ -42,9 +41,8 @@
                                   <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,  }]" :label="peopleShow" placeholder="只统计当前户号（区域）" type="number" input-align="right">
+                                  <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>
-                                  <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" />
@@ -340,7 +338,6 @@ export default {
             tips6: false,
             tips7: false,
             // tips8: false,
-            tips10: false,
             newAnswer: [],    // 问答题存
             loading:false,
             result1: '无',
@@ -734,7 +731,6 @@ export default {
 
   methods: {
     async checkArea(){
-        this.showTips10()
         if(this.formData.totalArea>50000&&this.formData.peopleNum){
             let params = {
                 totalArea: this.formData.totalArea,
@@ -816,14 +812,6 @@ 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]) {
@@ -1011,8 +999,8 @@ export default {
                             //     }
                             // })
                           }else{
-                            this.showData.buildType1 =  this.option[i].text
+                              this.showData.buildType1 =  this.option[i].text
-                            this.mainActiveIndex = i
+                              this.mainActiveIndex = i
 
                           }
                       }
@@ -1289,31 +1277,34 @@ export default {
                 .then((res) => {
                     if (res.code == 0) {
                         let arr = []
+                        console.log(select, 'ss', res.data);
                         this.mainActiveIndex = 0
                         res.data.forEach((v, i) => {
                             if(v.code == select) this.mainActiveIndex = i
                             let list = []
                             if(v.child){
-                                list = v.child.map((ele) => {
+                            list = v.child.map((ele) => {
-                                    return {
+                                return {
-                                        text: ele.name,
+                                    text: ele.name,
-                                        id: ele.code,
+                                    id: ele.code,
-                                        pCode: ele.pCode
+                                    pCode: ele.pCode
-                                    }
+                                }
-                                })
+                            })
-                            }
                                 
+                            }
                             arr.push({
                                 text: v.name,
                                 value: v.code,
-                                children: list,
+                                children: list||[],
                                 disabled: select!=6&&!(v.code == select)
                             })
                         })
+                        console.log(arr, 'arrooo', this.option);
                         this.option = arr
                     }
                 })
                 .catch(() => {
+                    console.log('shibai');
                     this.$toast('失败')
                 })
         },
@@ -1893,7 +1884,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 || this.tips10){
+            if(this.checkAreaTip|| this.tips0 == true || this.tips1 == true || this.tips2 == true || this.tips3 == true || this.tips4 == true || this.tips6 == true || this.tips7){
                 return;
             }
             if(this.gfShow == 1&&(this.tips8||this.tips9)){

src/views/energyEfficiency/yearEnergy.vue

@@ -14,19 +14,19 @@
                 </div>
                 <div class="nengyuan">
                     <van-cell-group>
-                        <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.floatNo0 v-model="yearForm.power" label="电(kWh)" 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.naturalGas" label="天然气(m³)" 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.steam" label="饱和蒸汽(t)" 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.dieselGas" 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.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.petroleumGas" label="液化石油气(t)" 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.hot" label="热力(GJ)" 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.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.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.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.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.energyConsumptionInformationEquipment" label=" 信息设备电能消耗(kWh)" placeholder="请输入" />
-                        <van-field  @blur="changeData" :disabled="showForm" type="number" v-input.reset v-model="yearForm.energyOther" label="其他" placeholder="请输入" />
+                        <van-field :disabled="showForm" type="number" v-input.reset v-model="yearForm.energyOther" label="其他" placeholder="请输入" />
                     </van-cell-group>
                 </div>
                 <!-- 资源 -->
@@ -49,18 +49,6 @@
                         <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>
     
@@ -76,67 +64,13 @@
 <script>
 // import Header from "@/components/headerNew";
 import { Notify } from "vant";
-import { yearEdit, getSingleYearInfo, factorlist} from "@/api/energyConsumption";
+import { yearEdit, getSingleYearInfo } 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,
@@ -155,8 +89,7 @@ export default {
                 centralHeating: 0,
                 energyConsumptionInformationEquipment: 0,
             },
-            tidCid: null,
+            tidCid: null
-            dataList:[]
         };
     },
     computed: {
@@ -175,17 +108,6 @@ 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;
@@ -198,19 +120,6 @@ 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 @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.systemModel" 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 v-model="form.motorModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" maxlength="20" label="电机型号" placeholder="请输入电机型号"/>
-                            <van-field label="设备类型" v-model="form.equipTypeName" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','02')" />
+                            <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.equipEfficiencyName" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                            <van-field @blur="changeDataNum('02', ['systemModel','motorModel'], ['absoleteNum','absoleteElecNum'])" v-input.numNo0 v-model="form.systemNum" type="number" label="台数（台）" placeholder="请输入台数" />
+                            <van-field v-input.numNo0 v-model="form.systemNum" type="number" required :rules="[{  required: true }]" label="台数（台）" placeholder="请输入台数" />
-                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange"/>
+                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" type="number" required :rules="[{  required: true }]" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange"/>
-                            <van-field v-input.float v-model="form.frequencyPerValue" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
+                            <van-field v-input.float v-model="form.frequencyPerValue" type="number" required :rules="[{  required: true }]" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
-                            <van-field disabled v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
-                            <van-field disabled v-input.num v-model="form.absoleteNum" type="number" label="淘汰泵机数量" placeholder="请输入" />
+                            <van-field 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="累计运行小时数" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -50,7 +50,6 @@ 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 {
@@ -59,7 +58,7 @@ export default {
         VanPickerNew,
         Year
     },
-    mixins: [mixin, dieoutMixin, modelValidatorMixin],
+    mixins: [mixin],
     data() {
         return {
             addeditId: '',    // 新增修改提交id

src/views/enterprise/customer.vue

@@ -17,8 +17,8 @@
           }}
         </div>
         <div class="list-item-div">
-          <img src="@/assets/orgName.png" alt="" />所属区域：
+          <img src="@/assets/orgName.png" alt="" />区县公司：
-          {{ personDetail.orgName }}
+          {{ personDetail.consOrgName }}
         </div>
         <div class="list-item-div list-item-display" style="overflow: unset;">
           <img src="@/assets/contactName.png" alt="" /> 联系人：

src/views/enterprise/fengjiSystemAddEdit.vue

@@ -6,19 +6,19 @@
                 <div class="year-main">
                     <div class="nengyuan">
                         <van-cell-group>
-                            <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.systemModel" 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 v-model="form.motorModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="电机型号" placeholder="请输入电机型号" maxlength="20"/>
-                            <van-field label="设备类型" v-model="form.equipTypeName" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','03')" />
+                            <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.equipEfficiencyName" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                            <van-field @blur="changeDataNum('02', ['systemModel','motorModel'], ['absoleteNum','absoleteElecNum'])" v-input.numNo0 v-model="form.systemNum" type="number" label="台数（台）" placeholder="请输入台数" />
+                            <van-field v-input.numNo0 v-model="form.systemNum" required :rules="[{  required: true }]" type="number" label="台数（台）" placeholder="请输入台数" />
-                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',20,'单台额定功率')"/>
+                            <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.float v-model="form.frequencyPerValue" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
+                            <van-field v-input.float v-model="form.frequencyPerValue" required :rules="[{  required: true }]" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
-                            <van-field disabled v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
-                            <van-field disabled v-input.num v-model="form.absoleteNum" type="number" label="淘汰风机数量" placeholder="请输入" />
+                            <van-field 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="累计运行小时数" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -51,7 +51,6 @@ 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 {
@@ -60,7 +59,7 @@ export default {
         VanPickerNew,
         Year
     },
-    mixins: [mixin, dieoutMixin, modelValidatorMixin],
+    mixins: [mixin],
     data() {
         return {
             title: '新增/修改',

src/views/enterprise/generalEnergyAddEdit.vue

@@ -6,16 +6,16 @@
                 <div class="year-main">
                     <div class="nengyuan">
                         <van-cell-group>
-                            <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-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="型号" maxlength="20" 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.systemNum" type="number" required :rules="[{  required: true }]" label="台数（台）" placeholder="请输入台数" />
-                            <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.numNo0 v-model="form.ratedCapacityValue" required :rules="[{  required: true }]" ltype="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 disabled v-input.num v-model="form.absoleteNum" type="number" label="淘汰变压器数量" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.absoleteNum" type="number" label="淘汰变压器数量" placeholder="请输入" />
-                            <van-field v-input.floatNo0 v-model="form.loadRate" type="number" label="负载率（%）" placeholder="请输入"  @input="handelChangeNumber('loadRate','负载率')" />
+                            <van-field v-input.floatNo0 v-model="form.loadRate" required :rules="[{  required: true }]" type="number" label="负载率（%）" placeholder="请输入"  @input="handelChangeNumber('loadRate','负载率')" />
-                            <van-field v-input.num v-model="form.userYear" type="number" label="投入年份" placeholder="请选择投入年份" is-link  readonly @click="handelClickYear('userYear', 'SET_CON_YEAR')" />
+                            <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 label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" is-link  readonly @click="datePicker = true" />
+                            <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.equipEfficiencyName" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -66,7 +66,6 @@
 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 {
@@ -75,7 +74,7 @@ export default {
         Year,
         VanPickerNew
     },
-    mixins: [mixin, dieoutMixin, modelValidatorMixin],
+    mixins: [mixin],
     data() {
         return {
             inVoltage: '',

src/views/enterprise/kongyajiSystemAddEdit.vue

@@ -6,19 +6,19 @@
                 <div class="year-main">
                     <div class="nengyuan">
                         <van-cell-group>
-                            <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.systemModel" 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 v-model="form.motorModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="电机型号" placeholder="请输入电机型号" maxlength="20"  />
-                            <van-field label="设备类型" v-model="form.equipTypeName" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','01')" />
+                            <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.equipEfficiencyName" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                            <van-field @blur="changeDataNum('04', ['systemModel','motorModel'], ['absoleteNum','absoleteElecNum'])" v-input.numNo0 v-model="form.systemNum" type="number" label="台数（台）" placeholder="请输入台数" />
+                            <van-field v-input.numNo0 v-model="form.systemNum" type="number" required :rules="[{  required: true }]" label="台数（台）" placeholder="请输入台数" />
-                            <van-field v-input.floatNo0 v-model="form.ratedPowerValue" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',5,'单台额定功率')"/>
+                            <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.float v-model="form.frequencyPerValue" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
+                            <van-field v-input.float v-model="form.frequencyPerValue" required :rules="[{  required: true }]" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
-                            <van-field disabled v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
-                            <van-field disabled v-input.num v-model="form.absoleteNum" type="number" label="淘汰空压机数量" placeholder="请输入" />
+                            <van-field 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="累计运行小时数" placeholder="请输入" />
+                            <van-field v-input.num v-model="form.runHours" type="number" label="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -53,14 +53,13 @@ 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, dieoutMixin, modelValidatorMixin],
+    mixins: [mixin],
     data() {
         return {
             title: '新增/修改',

src/views/enterprise/yearEnergyAddEdit.vue

@@ -117,25 +117,6 @@
                   <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
@@ -146,16 +127,6 @@
                 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>
@@ -458,14 +429,6 @@ 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: '', // 主要余热排放温度
@@ -493,40 +456,7 @@ 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: {
@@ -565,14 +495,6 @@ export default {
                 }
             },
             deep: true
-        },
-        'notUsedResidueEnergyName': {
-            handler(val) {
-                if(val.indexOf('其他') < 0) {
-                    this.otherUseMethod = ''
-                }
-            },
-            deep: true
         }
     },
     computed: {
@@ -694,7 +616,6 @@ export default {
                       this.notHeatDemandName = '', // 企业非生产工艺用热需求名称显示
                       this.heatDemandOtherName = '', // 企业生产工艺用热需求其他具体内容
                       this.notHeatDemandOtherName = '' // 企业非生产工艺用热需求其他具体内容
-                      this.otherUseMethod = ''
                     }
                 }
             } else if(this.type == 'residueHotTempOption') {
@@ -845,9 +766,6 @@ 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){
@@ -941,7 +859,6 @@ 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

@@ -8,31 +8,30 @@
                 <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 @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="form.model" label="设备型号"  required :rules="[{  required: true },{pattern:/^.{2,30}$/, 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="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 @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.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.backupExpl" 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 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.useYear"  label="设备投用年份" label-width="140" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
-                        <van-field v-model="form.loadFactor" v-input.float label="负载系数"  type="number"  :rules="[{ required: false }]" input-align="right" placeholder="请输入" />
+                        <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.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" :rules="[{ required: false }]" label-width="220"  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.runDays" v-input.maxYearDay 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.coldPerArea" v-input.float label="单位面积冷量（kW/平方米）"  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 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.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
-                        <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" clearable placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
+                        <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" :rules="[{  required: false }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
+                        <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 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.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" 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.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="请输入" :rules="[{ required: false }]" 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.centralAirConditionerCop" type="number" label="集中式空调机组平均COP" placeholder="请输入" :rules="[{ required: false }]" label-width="200"  input-align="right"/>
+                        <van-field v-input.float v-model="form.centralAirConditionerCop" 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>
                     <van-cell class="img-box box1" title="设备外观" :required="$store.getters.cityType"/>
                     <Uploader type="exteriorImage1" :value="exteriorImage1" @afterRead="afterRead1" @delImg="delImg1" @onUpload="onUpload1" />
@@ -58,22 +57,22 @@
                     <van-cell-group>
                         <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 @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="form.model" label="设备型号"  required :rules="[{  required: true },{pattern:/^.{2,30}$/, 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 @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.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.backupExpl" 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 v-model="form.useYear" label="设备投用年份" label-width="140" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
+                        <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.loadFactor" v-input.float label="负载系数"  type="number" input-align="right" placeholder="请输入" />
+                        <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.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" label-width="220"  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.runDays" v-input.maxYearDay 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.coldPerArea" v-input.float label="单位面积冷量（kW/平方米）"  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 label="设备能效等级" v-model="form.equipEfficiencyName" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                        <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.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
-                        <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.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" 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.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" 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" />
@@ -92,27 +91,26 @@
                 <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 @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="form1.model" label="设备型号"  required :rules="[{  required: true },{pattern:/^.{2,30}$/, 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" required :rules="[{ required: true }]"  label-width="100" 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 @input="changeTips" v-model="form1.heatCapacity" v-input.floatNo0 label="额定制热量(kW)" type="number" 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.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.backupExpl" 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 v-model="form1.useYear" label="设备投用年份" label-width="140" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('useYear')" />
+                        <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.loadFactor" v-input.float label="负载系数"  type="number" input-align="right" placeholder="请输入" />
+                        <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.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" label-width="220"  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.runDays" v-input.maxYearDay 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.heatPerArea" v-input.float label="单位面积热量（kW/平方米）"  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 label="设备能效等级" v-model="form1.equipEfficiencyName" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                        <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.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
-                        <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.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" 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.num v-model="form1.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" 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" />
@@ -153,7 +151,6 @@ 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";
@@ -167,7 +164,7 @@ export default {
         // Header,
         VanPickerNew,
     },
-    mixins: [mixin, dieoutMixin],
+    mixins: [mixin],
 
     computed: {
         pureDigital() {
@@ -208,18 +205,8 @@ 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: [], //设备铭牌
@@ -247,7 +234,6 @@ export default {
                 refrigeNum: "",
                 ratedPower: "",
                 coolCapacity: "",
-                totalConcatenatedCold: '',
                 useExpl: "",
                 backupExpl: "",
                 useYear: "",
@@ -293,6 +279,7 @@ export default {
                 saveElectricity: '',
                 carbonEmissionFactor:'',
                 carbonReduction:'',
+
             },
             formColumns: {
                 refrigeType: "",
@@ -890,7 +877,6 @@ export default {
                 refrigeNum: "",
                 ratedPower: "",
                 coolCapacity: "",
-                totalConcatenatedCold: '',
                 useExpl: "",
                 backupExpl: "",
                 useYear: "",
@@ -934,6 +920,7 @@ export default {
                 saveElectricity: '',
                 carbonEmissionFactor:'',
                 carbonReduction:'',
+
             };
             this.formColumns = {
                 refrigeType: "",

src/views/facilityManage/components/distributionSystem.vue

@@ -18,10 +18,10 @@
                 <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" label="变压器最早投运年限(年)" label-width="140" input-align="right" placeholder="请输入" is-link readonly @click="handelClickYear('useYear')" />
+                <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 label="设备能效等级" v-model="form.equipEfficiencyName" input-align="right" label-width="140" placeholder="请选择设备能效等级" is-link readonly @click="handelClickOptionShow('equipEfficiency')" />
+                <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.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="请输入" 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 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="请输入" />
     
@@ -31,6 +31,7 @@
                 <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" />

src/views/facilityManage/components/fissionAir.vue

@@ -3,49 +3,31 @@
           <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 @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.dieoutNum" v-input.num 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.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 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.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.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.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-cell-group>
-                  <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: '',
@@ -54,11 +36,6 @@ export default {
                 saveElectricity: '',
                 carbonEmissionFactor:'',
                 carbonReduction:'',
-                model: '',
-                produceDate: '',
-                equipEfficiency: '',
-                equipEfficiencyName: '',
-                cumulativeRunHours: '',
             },
             eqid: '',
 
@@ -105,8 +82,6 @@ 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" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                  <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" 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

@@ -9,13 +9,13 @@
           <div class="focusItem">
               <div class="inputStyle">
                   <van-cell-group>
-                      <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.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="设备最早投入使用年份" label-width="150" is-link input-align="right" placeholder="请输入" readonly @click="handelClickYear('useYear', 'SET_CON_YEAR')" />
+                      <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')" />
                       <!-- 是否进行过设备改造 -->
                       <Whether required :rules="[{ required: true, message:'请选择设备改造' }]" :value="formColumns.conEquipModiyName" @onConfirmTrueFalse="onConfirmTrueFalse" feildName="conEquipModiy" special="1" />
                       <!-- 改造方式 -->
@@ -33,21 +33,20 @@
                       />
                       <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" input-align="right" placeholder="请输入" />
+                      <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.runHours" v-input.maxDayHour label="每日运行时间（小时）"  type="number" label-width="220"  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.runDays" v-input.maxYearDay 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.coldPerArea" v-input.float label="单位面积冷量（kW/平方米）"  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 label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" label-width="140" input-align="right" is-link  readonly @click="datePicker = true" />
-                      <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.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.backupExpl" 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 label="设备能效等级" v-model="form.equipEfficiencyName"  placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
+                      <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" 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.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" 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.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" 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.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.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-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"/>
@@ -132,7 +131,6 @@ 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'
@@ -150,7 +148,7 @@ export default {
         VanPickerNew,
         btnUploader
     },
-    mixins: [mixin, dieoutMixin, modelValidatorMixin],
+    mixins: [mixin],
 
     data() {
         return {
@@ -171,7 +169,6 @@ export default {
                 ratedPower: "",
                 refrigeNum: '', //空调数量
                 coolCapacity: '', //总额定制冷量
-                totalConcatenatedCold: '',
                 useYear: '', //设备最早投入使用年份
                 refrigeType: 8,
                 conIntellectModifyYear: '', //增加主机智能化集中控制系统年份
@@ -192,8 +189,7 @@ export default {
                 saveElectricity: '',
                 carbonEmissionFactor:'',
                 carbonReduction:'',
-                multiAirConditionerCop:'',
+                multiAirConditionerCop:''
-
             },
 
             /**