diff --git a/src/api/api.js b/src/api/api.js
index 091a587..282d868 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -288,3 +288,11 @@ export function getNxzdPower(params) {
     params: { "customerId": params }
   })
 }
+// 建筑面积查重
+export function duplicateCheck(params) {
+  return myAxios({
+    url: `${sx}/energy-effcicency-net-service/nxzdBuildInfoNet/duplicateCheck`,
+    method: 'POST',
+    data: params
+  })
+}
\ No newline at end of file
diff --git a/src/mixins/mixin.js b/src/mixins/mixin.js
index 95f26f2..ee827b0 100644
--- a/src/mixins/mixin.js
+++ b/src/mixins/mixin.js
@@ -3,6 +3,7 @@ import { getCodeCommon } from '../views/facilityManage/common'
 const mixin = {
   data() {
     return {
+      showOption: false,
       /**
        * 字典表数据
        */
@@ -23,10 +24,69 @@ const mixin = {
        * vuex方法
        */
       vuexFunc: '',
-      vuexChangeFun: ''
+      vuexChangeFun: '',
+      
+      datePicker: false,
+      currentDate: new Date(),
+      maxDate: new Date(),
+      equipTypeOption: {
+        '01':[
+          {value: "0101", text: "螺杆式空压机"},
+          {value: "0102", text: "活塞式空压机"},
+          {value: "0103", text: "离心式空压机"},
+          {value: "0104", text: "涡旋式空压机"},
+          {value: "0105", text: "滑片式空压机"},
+          {value: "0106", text: "无油空压机"},
+        ],
+        '02':[
+          {value: "0201", text: "离心泵"},
+          {value: "0202", text: "轴流泵"},
+          {value: "0203", text: "混流泵"},
+          {value: "0204", text: "往复泵"},
+          {value: "0205", text: "旋转泵"},
+          {value: "0206", text: "喷射泵"},
+          {value: "0207", text: "空气提升泵"},
+        ],
+        '03':[
+          {value: "0301", text: "离心式风机"},
+          {value: "0302", text: "轴流式风机"},
+          {value: "0303", text: "混流式(斜流式)风机"},
+          {value: "0304", text: "横流式(贯流式)风机"},
+          {value: "0305", text: "罗茨风机(容积式)"},
+        ]
+      },
+      equipEfficiencyOption: [
+        { value: '01', text: '一级能效'},
+        { value: '02', text: '二级能效'},
+        { value: '03', text: '三级能效'},
+        { value: '04', text: '四级能效'},
+        { value: '05', text: '五级能效'},
+      ],
+      element: '',
+      columnsList: [],
     }
   },
   methods: {
+    // 企业公用弹窗
+    handelClickOptionShow(name, key){
+      this.element = name
+      if(key){
+        this.columnsList = this[name+'Option'][key]
+      }else{
+        this.columnsList = this[name+'Option']
+      }
+      this.showOption = true
+    },
+    onConfirmOption(data){
+      if(this.$route.params&&this.$route.params.type=='3'){
+        this.$set(this.form1, this.element, data.value)
+        this.form1[this.element+'Name'] = data.text
+      }else{
+        this.form[this.element] = data.value
+        this.form[this.element+'Name'] = data.text
+      }
+      this.showOption = false
+    },
     //通用的弹框获取数据
     async handelClickHeatingShow(type, id, feildName, feild, title) {
       this.show = !this.showForm
@@ -153,7 +213,26 @@ const mixin = {
     //控制年份取消
     onCancelYear() {
       this.yearShow = false
-    }
+    },
+    
+    // 日期选择赋值
+    onConfirmDate(val) {
+      var date2 = new Date(val);
+      var y = date2.getFullYear();
+      var m = date2.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      var d = date2.getDate();
+      d = d < 10 ? "0" + d : d;
+      this.form.produceDate = y + "-" + m + "-" + d;
+      console.log(this.form.produceDate);
+      if(this.$route.query&&this.$route.query.id=='heating'){
+        this.$store.commit('search/SET_HEAT_YEAR', this.form)
+      }
+      if(this.$route.params&&this.$route.params.type=='3'){
+       this.form1.produceDate = y + "-" + m + "-" + d;
+      }
+      this.datePicker = false;
+    },
     // change(data) {
     //   console.log(data);
     // }
diff --git a/src/store/getters.js b/src/store/getters.js
index 131d62b..fedf40a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -57,6 +57,7 @@ export default {
   heatMode: state => state.search.heatMode, //采暖方式
   pumpYear: state => state.search.pumpYear, //输送泵组设备年份
   pumpNum: state => state.search.pumpNum, //输送泵组台数
+  produceDate: state => state.search.produceDate, //输送泵组台数
   /**
    * 集中式空调
    */
diff --git a/src/store/module/search.js b/src/store/module/search.js
index 29797bc..469f329 100644
--- a/src/store/module/search.js
+++ b/src/store/module/search.js
@@ -30,6 +30,7 @@ const getDefaultState = () => ({
   pumpNum: '',
   pumpTotalPower: '',
   pumpYear: '',
+  produceDate: '',
   /**
    * 集中式空调
    */
@@ -104,7 +105,9 @@ const mutations = {
     state.heatIntellectModifyYear = data.heatIntellectModifyYear
     state.heatModifyYear = data.heatModifyYear
     state.pumpYear = data.pumpYear
+    state.produceDate = data.produceDate
   },
+
   /**
    * 集中式空调
    */
diff --git a/src/views/comment/components/energyReport-bar.vue b/src/views/comment/components/energyReport-bar.vue
index 29e5f86..da50353 100644
--- a/src/views/comment/components/energyReport-bar.vue
+++ b/src/views/comment/components/energyReport-bar.vue
@@ -74,7 +74,7 @@
         <p v-else>贵单位无相关节能改造措施，评定不得分。</p>
         <!-- <p v-else>{{ EnergyReportInfo.conservationScoreNull }}</p> -->
         <br>
-        <p>注：各个维度满分为5分。</p>
+        <p>注：各个维度满分为100分。</p>
       </div>
     </div>
     <div class="summarize-btn" style="display:none">
diff --git a/src/views/energyEfficiency/constructionInfo.vue b/src/views/energyEfficiency/constructionInfo.vue
index 630d919..977bf4d 100644
--- a/src/views/energyEfficiency/constructionInfo.vue
+++ b/src/views/energyEfficiency/constructionInfo.vue
@@ -18,8 +18,10 @@
                                   <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" 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>
                                   <div class="tips" v-if="tips0 == true">0&lt;总建筑面积&lt;{{validateData}}万平方米</div>
                                   <div class="tips" v-if="tips1 == true">要大于可利用屋面面积或者地下车库面积</div>
                                   <van-field v-model="formData.availableArea" v-input.float label="可利用屋面面积(㎡)" placeholder="请输入" required :rules="[{  required: true}]" @input="showTips1" type="number" input-align="right">
@@ -39,8 +41,9 @@
                                   <div class="tips" v-if="tips7 == true">数据机房面积≤0.5*总建筑面积</div>
                                   <van-cell title="建筑投运年份(年)" is-link required :rules="[{  required: true, message: '请选择建筑投运年份年份' }]" :value="formData.operationYear" @click="handelOpen" />
                                   <!-- <van-field v-model="formData.operationYear" label="建筑投运年份(年)" label-width="140" input-align="right" is-link placeholder="请选择" readonly @click="handelClickYear('operationYear', 'SET_HEAT_YEAR')" /> -->
-                                  <van-field v-model="formData.peopleNum" v-input.numNo0 required :rules="[{required: true, message: `请先选择建筑类型再填写` }]" :label="peopleShow" placeholder="" type="number" input-align="right">
+                                  <van-field v-model="formData.peopleNum" v-input.numNo0 required  @blur="checkArea" :rules="[{required: true, message: `请先选择建筑类型再填写` }]" :label="peopleShow" placeholder="" type="number" input-align="right">
                                   </van-field>
+                                  <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" />
                                   <div class="tips tipImage" v-if="$store.getters.cityType&&fileList.length<1">请上传建筑外观照片</div>
@@ -311,6 +314,7 @@ import {
     uploadFile,
     changeSaveStateAPI,
     // downloadFile,
+    duplicateCheck,
 } from '@/api/api.js'
 // import { debuglog } from 'util'
 import {debounce} from '@/utils/common.js'
@@ -596,6 +600,7 @@ export default {
             ],
             validateData: '',
             doDebounce: null,
+            checkAreaTip: false
         }
     },
     watch: {
@@ -721,6 +726,19 @@ export default {
     },
 
   methods: {
+    async checkArea(){
+        if(this.formData.totalArea>50000&&this.formData.peopleNum){
+            let params = {
+                totalArea: this.formData.totalArea,
+                customerId: this.formData.customerId,
+                peopleNum: this.formData.peopleNum,
+                year: this.tidCid.item&&this.tidCid.item.year
+            }
+            let res = await duplicateCheck(params)
+            this.checkAreaTip = res.data
+        }
+
+    },
     showTips() {
         if (Number(this.formData.totalArea)>0&&Number(this.formData.totalArea)<this.validateData*10000) {
             this.tips0 = false 
@@ -1851,7 +1869,7 @@ export default {
             //     this.formData.enquireIds = this.aarr1.concat(this.aarr)
             // }
             // this.tips6 == true ||
-            if(this.tips0 == true || this.tips1 == true || this.tips2 == true || this.tips3 == true || this.tips4 == true || this.tips6 == true || this.tips7){
+            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)){
diff --git a/src/views/enterprise/bengjiSystemAddEdit.vue b/src/views/enterprise/bengjiSystemAddEdit.vue
index 1ddb039..40c8d1b 100644
--- a/src/views/enterprise/bengjiSystemAddEdit.vue
+++ b/src/views/enterprise/bengjiSystemAddEdit.vue
@@ -8,6 +8,8 @@
                         <van-cell-group>
                             <van-field v-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" maxlength="20" label="泵机型号" placeholder="请输入泵机型号"/>
                             <van-field 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" required :rules="[{  required: true }]" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','02')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                             <van-field 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" required :rules="[{  required: true }]" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange"/>
                             <van-field v-input.float v-model="form.frequencyPerValue" type="number" required :rules="[{  required: true }]" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
@@ -15,6 +17,8 @@
                             <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="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -33,10 +37,16 @@
             </div>
         </van-overlay>
         <Year :show="yearShow" :num="1" @onConfirmYear="onConfirmYear" @onCancelYear="onCancelYear" />
+        <!-- 年份选择 -->
+        <van-popup v-model="datePicker" position="bottom">
+            <van-datetime-picker v-model="currentDate" type="date"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
+        <VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
     </div>
 </template>
 
 <script>
+import VanPickerNew from '@/components/vanPickerNew'
 import { pumpAdd, pumpGetInfo, pumpEdit } from "@/api/universalEnergy.js"
 import { Notify } from "vant";
 import mixin from '@/mixins/mixin'
@@ -45,6 +55,7 @@ import {debounce} from '@/utils/common.js'
 export default {
     components: {
         // Header,
+        VanPickerNew,
         Year
     },
     mixins: [mixin],
@@ -64,6 +75,10 @@ export default {
                 absoleteNum: '',
                 efficiency: '',
                 userYear: '',
+                produceDate: '',
+                equipType: '',
+                equipEfficiency: '',
+                runHours: '',
             },
             show: false,
             doDebounce: null,
@@ -81,6 +96,10 @@ export default {
             absoleteNum: '',
             efficiency: '',
             userYear: '',
+            produceDate: '',
+            equipType: '',
+            equipEfficiency: '',
+            runHours: '',
         };
         let msg = JSON.parse(sessionStorage.getItem('tidCid'));
         this.userMsg = msg
@@ -164,6 +183,10 @@ export default {
             const res = await pumpGetInfo(this.id);
             if(res.code == 0) {
                 this.form = res.data
+                let Efficiency = res.data.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == res.data.equipEfficiency)
+                this.form.equipEfficiencyName = Efficiency&&Efficiency.text
+                let equipType = res.data.equipType&&this.equipTypeOption['02'].find(item => item.value == res.data.equipType)
+                this.form.equipTypeName = equipType&&equipType.text
                 this.show = false
             }else {
                 this.show = false
diff --git a/src/views/enterprise/fengjiSystemAddEdit.vue b/src/views/enterprise/fengjiSystemAddEdit.vue
index 852ebe0..7d8ae6a 100644
--- a/src/views/enterprise/fengjiSystemAddEdit.vue
+++ b/src/views/enterprise/fengjiSystemAddEdit.vue
@@ -8,6 +8,8 @@
                         <van-cell-group>
                             <van-field v-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="风机型号" placeholder="请输入风机型号" maxlength="20" />
                             <van-field 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" required :rules="[{  required: true }]" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','03')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                             <van-field v-input.numNo0 v-model="form.systemNum" required :rules="[{  required: true }]" type="number" label="台数（台）" placeholder="请输入台数" />
                             <van-field v-input.floatNo0 v-model="form.ratedPowerValue" required :rules="[{  required: true }]" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',20,'单台额定功率')"/>
                             <van-field v-input.float v-model="form.frequencyPerValue" required :rules="[{  required: true }]" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
@@ -15,6 +17,8 @@
                             <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="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -33,10 +37,16 @@
             </div>
         </van-overlay>
         <Year :show="yearShow" :num="1" @onConfirmYear="onConfirmYear" @onCancelYear="onCancelYear" />
-    </div>
+        <!-- 年份选择 -->
+        <van-popup v-model="datePicker" position="bottom">
+            <van-datetime-picker v-model="currentDate" type="date"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
+        <VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
+     </div>
 </template>
 
 <script>
+import VanPickerNew from '@/components/vanPickerNew'
 import { fanAdd, fanGetInfo, fanEdit } from "@/api/universalEnergy.js"
 import { Notify } from "vant";
 // import Header from "@/components/headerNew";
@@ -46,6 +56,7 @@ import {debounce} from '@/utils/common.js'
 export default {
     components: {
         // Header,
+        VanPickerNew,
         Year
     },
     mixins: [mixin],
@@ -64,6 +75,10 @@ export default {
                 absoleteNum: '',
                 efficiency: '',
                 userYear: '',
+                produceDate: '',
+                equipType: '',
+                equipEfficiency: '',
+                runHours: '',
             },
             show: false,
             doDebounce: null,
@@ -81,6 +96,10 @@ export default {
             absoleteNum: '',
             efficiency: '',
             userYear: '',
+            produceDate: '',
+            equipType: '',
+            equipEfficiency: '',
+            runHours: '',
         };
         let msg = JSON.parse(sessionStorage.getItem('tidCid'));
         this.userMsg = msg
@@ -164,6 +183,10 @@ export default {
             const res = await fanGetInfo(this.id);
             if(res.code == 0) {
                 this.form = res.data
+                let Efficiency = res.data.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == res.data.equipEfficiency)
+                this.form.equipEfficiencyName = Efficiency&&Efficiency.text
+                let equipType = res.data.equipType&&this.equipTypeOption['03'].find(item => item.value == res.data.equipType)
+                this.form.equipTypeName = equipType&&equipType.text
                 this.show = false
             }else {
                 this.show = false
diff --git a/src/views/enterprise/generalEnergyAddEdit.vue b/src/views/enterprise/generalEnergyAddEdit.vue
index 47b3415..2346371 100644
--- a/src/views/enterprise/generalEnergyAddEdit.vue
+++ b/src/views/enterprise/generalEnergyAddEdit.vue
@@ -14,6 +14,7 @@
                             <van-field v-input.num v-model="form.absoleteNum" type="number" label="淘汰变压器数量" placeholder="请输入" />
                             <van-field v-input.floatNo0 v-model="form.loadRate" required :rules="[{  required: true }]" type="number" label="负载率（%）" placeholder="请输入"  @input="handelChangeNumber('loadRate','负载率')" />
                             <van-field v-input.num v-model="form.userYear" required :rules="[{  required: true }]" type="number" label="投入年份" placeholder="请选择投入年份" is-link  readonly @click="handelClickYear('userYear', 'SET_CON_YEAR')" />
+                            <van-cell title="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" type="number" placeholder="请选择设备生产日期" is-link  readonly @click="datePicker = true" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -49,6 +50,10 @@
                 </div>
             </div>
         </VanPickerNew>
+        <!-- 年份选择 -->
+        <van-popup v-model="datePicker" position="bottom">
+            <van-datetime-picker v-model="currentDate" type="date"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
     </div>
 </template>
 
@@ -67,6 +72,9 @@ export default {
     mixins: [mixin],
     data() {
         return {
+            datePicker: false,
+            currentDate: new Date(),
+            maxDate: new Date(),
             levelShow: false,
             levelList:[
                 {value:'10', checked: false},
@@ -90,6 +98,7 @@ export default {
                 absoleteNum: "",
                 loadRate: '',
                 userYear: '',
+                produceDate: ''
             },
             show: false
         };
@@ -105,6 +114,7 @@ export default {
             absoleteNum: "",
             loadRate: '',
             userYear: '',
+            produceDate: ''
         };
         let msg = JSON.parse(sessionStorage.getItem('tidCid'));
         // let msg2 = localStorage.getItem('customerItem');
@@ -224,7 +234,7 @@ export default {
             }else {
                 this.show = false
             }
-        }
+        },
     },
 };
 </script>
diff --git a/src/views/enterprise/kongyajiSystemAddEdit.vue b/src/views/enterprise/kongyajiSystemAddEdit.vue
index 91d276b..208ae6b 100644
--- a/src/views/enterprise/kongyajiSystemAddEdit.vue
+++ b/src/views/enterprise/kongyajiSystemAddEdit.vue
@@ -8,6 +8,8 @@
                         <van-cell-group>
                             <van-field v-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="空压机型号" placeholder="请输入空压机型号" maxlength="20" />
                             <van-field 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" required :rules="[{  required: true }]" placeholder="请选择设备类型" is-link  readonly @click="handelClickOptionShow('equipType','01')" />
+                            <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                             <van-field v-input.numNo0 v-model="form.systemNum" type="number" required :rules="[{  required: true }]" label="台数（台）" placeholder="请输入台数" />
                             <van-field v-input.floatNo0 v-model="form.ratedPowerValue" required :rules="[{  required: true }]" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',5,'单台额定功率')"/>
                             <van-field v-input.float v-model="form.frequencyPerValue" required :rules="[{  required: true }]" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')"  />
@@ -15,6 +17,8 @@
                             <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="累计运行小时数" required :rules="[{  required: true }]" placeholder="请输入" />
                         </van-cell-group>
                     </div>
                 </div>
@@ -33,10 +37,16 @@
             </div>
         </van-overlay>
         <Year :show="yearShow" :num="1" @onConfirmYear="onConfirmYear" @onCancelYear="onCancelYear" />
-    </div>
+        <!-- 年份选择 -->
+        <van-popup v-model="datePicker" position="bottom">
+            <van-datetime-picker v-model="currentDate" type="date"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
+        <VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
+     </div>
 </template>
 
 <script>
+import VanPickerNew from '@/components/vanPickerNew'
 import { airAdd, airGetInfo, airEdit } from "@/api/universalEnergy.js"
 import { Notify } from "vant";
 import mixin from '@/mixins/mixin'
@@ -46,6 +56,7 @@ import {debounce} from '@/utils/common.js'
 export default {
     components: {
         // Header,
+        VanPickerNew,
         Year
     },
     mixins: [mixin],
@@ -64,6 +75,10 @@ export default {
                 absoleteNum: '',
                 efficiency: '',
                 userYear: '',
+                produceDate: '',
+                equipType: '',
+                equipEfficiency: '',
+                runHours: '',
             },
             show: false,
             doDebounce: null,
@@ -81,6 +96,10 @@ export default {
             absoleteNum: '',
             efficiency: '',
             userYear: '',
+            produceDate: '',
+            equipType: '',
+            equipEfficiency: '',
+            runHours: '',
         };
         let msg = JSON.parse(sessionStorage.getItem('tidCid'));
         // let msg2 = localStorage.getItem('customerItem');
@@ -163,6 +182,10 @@ export default {
             const res = await airGetInfo(this.id);
             if(res.code == 0) {
                 this.form = res.data
+                let Efficiency = res.data.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == res.data.equipEfficiency)
+                this.form.equipEfficiencyName = Efficiency&&Efficiency.text
+                let equipType = res.data.equipType&&this.equipTypeOption['01'].find(item => item.value == res.data.equipType)
+                this.form.equipTypeName = equipType&&equipType.text
                 this.show = false
             }else {
                 this.show = false
diff --git a/src/views/facilityManage/bursting/burstingDetail.vue b/src/views/facilityManage/bursting/burstingDetail.vue
index 27e36f2..8e89b6d 100644
--- a/src/views/facilityManage/bursting/burstingDetail.vue
+++ b/src/views/facilityManage/bursting/burstingDetail.vue
@@ -23,6 +23,9 @@
                         <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" required :rules="[{ required: true }]" 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" 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" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
                     </van-cell-group>
                     <van-cell class="img-box box1" title="设备外观" :required="$store.getters.cityType"/>
                     <Uploader type="exteriorImage1" :value="exteriorImage1" @afterRead="afterRead1" @delImg="delImg1" @onUpload="onUpload1" />
@@ -59,6 +62,9 @@
                         <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" required :rules="[{ required: true }]" 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" 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" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
                       </van-cell-group>
                     <van-cell class="img-box box1" title="设备外观"  :required="$store.getters.cityType"/>
                     <Uploader type="exteriorImage1" :value="exteriorImage1" @afterRead="afterRead1" @delImg="delImg1" @onUpload="onUpload1" />
@@ -90,6 +96,9 @@
                         <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" required :rules="[{ required: true }]" 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" 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" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
                       </van-cell-group>
                     <van-cell class="img-box box1" title="设备外观"  :required="$store.getters.cityType"/>
                     <Uploader type="exteriorImage1" :value="exteriorImage1" @afterRead="afterRead1" @delImg="delImg1" @onUpload="onUpload1" />
@@ -112,6 +121,12 @@
         </van-form>
     
     
+        <!-- 年份选择 -->
+        <van-popup v-model="datePicker" position="bottom">
+            <van-datetime-picker v-model="currentDate" type="date"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
+        <VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
+    
     
     </div>
 </template>
@@ -210,7 +225,10 @@ export default {
                 loadFactor: '',
                 runHours:'',
                 runDays: '',
-                coldPerArea: ''
+                coldPerArea: '',
+                equipEfficiency: '',
+                produceDate:'',
+                cumulativeRunHours: ''
             },
             form1: {
                 equipId:'',
@@ -230,7 +248,10 @@ export default {
                 loadFactor: '',
                 runHours:'',
                 runDays: '',
-                heatPerArea: ''
+                heatPerArea: '',
+                equipEfficiency: '',
+                produceDate:'',
+                cumulativeRunHours: ''
             },
             formColumns: {
                 refrigeType: "",
@@ -429,6 +450,9 @@ export default {
             for (const key in this.form) {
                 this.form[key] = data[key]
             }
+            
+            let Efficiency = data.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == data.equipEfficiency)
+            this.form.equipEfficiencyName = Efficiency&&Efficiency.text
             if(data.refrigeTypeName) {
               this.formColumns.refrigeTypeName = data.refrigeTypeName
             }
@@ -483,6 +507,9 @@ export default {
             for (const key in this.form) {
                 this.form[key] = data[key]
             }
+            
+            let Efficiency = data.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == data.equipEfficiency)
+            this.form.equipEfficiencyName = Efficiency&&Efficiency.text
             if(data.refrigeTypeName) {
               this.formColumns.refrigeTypeName = data.refrigeTypeName
             }
@@ -547,6 +574,9 @@ export default {
               for (const key in this.form1) {
                   this.form1[key] = data[key]
               }
+              
+            let Efficiency = data.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == data.equipEfficiency)
+            this.form1.equipEfficiencyName = Efficiency&&Efficiency.text
               if(heatCnLx && data) {
                 heatCnLx.forEach((v)=> {
                   if (data.unitType == v.code) {
diff --git a/src/views/facilityManage/components/distributionSystem.vue b/src/views/facilityManage/components/distributionSystem.vue
index fce65d9..317bc5f 100644
--- a/src/views/facilityManage/components/distributionSystem.vue
+++ b/src/views/facilityManage/components/distributionSystem.vue
@@ -8,13 +8,18 @@
     
                 <van-field v-model="trName" label="变压器类型" name="trName" required :rules="[{ required: true, message:'请至少选择一个变压器类型' }]" is-link input-align="right" placeholder="请选择" readonly @click="handelClcikTrShow = !showForm" />
                 
+                <van-field v-input.numNo0 v-show="s15show" v-model="form.s15AboveNum" label="变压器S15及以上台数" type="number" required :rules="[{ required: s15show, message:'请输入变压器S15及以上台数' }]" label-width="180" input-align="right" placeholder="请输入" />
+                <van-field v-input.numNo0 v-show="s14show" v-model="form.s14Num" label="变压器S14台数" type="number" required :rules="[{ required: s14show, message:'请输入变压器S14台数' }]" label-width="140" input-align="right" placeholder="请输入" />
                 <van-field v-input.numNo0 v-show="s13show" v-model="form.s13Num" label="变压器S13台数" type="number" required :rules="[{ required: s13show, message:'请输入变压器S13台数' }]" label-width="140" input-align="right" placeholder="请输入" />
                 <van-field v-input.numNo0 v-show="s12show" v-model="form.s12Num" label="变压器S12台数" type="number" required :rules="[{ required: s12show, message:'请输入变压器S12台数' }]" label-width="140" input-align="right" placeholder="请输入" />
                 <van-field v-input.numNo0 v-show="s11show" v-model="form.s11Num" label="变压器S11台数" type="number" required :rules="[{ required: s11show, message:'请输入变压器S11台数' }]" label-width="140" input-align="right" placeholder="请输入" />
                 <van-field v-input.numNo0 v-show="s10show" v-model="form.s10Num" label="变压器S10台数量" type="number" required :rules="[{ required: s10show, message:'请输入变压器S10台数量' }]" label-width="140" input-align="right" placeholder="请输入" />
                 <van-field v-input.numNo0 v-show="s9show" v-model="form.s9Num" label="变压器S9台数" type="number" required :rules="[{ required: s9show, message:'请输入变压器S9台数' }]" label-width="140" 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-input.numNo0 v-show="s8show" v-model="form.s8Num" label="变压器S8台数" type="number" required :rules="[{ required: s8show, message:'请输入变压器S8台数' }]" label-width="140" input-align="right" placeholder="请输入" />
+                <van-field v-input.numNo0 v-show="s7show" v-model="form.s7BelowNum" label="变压器S7及以下台数" type="number" required :rules="[{ required: s7show, message:'请输入变压器S7及以下台数' }]" label-width="180" input-align="right" placeholder="请输入" />
+                <van-field v-input.numNo0 v-show="othershow" v-model="form.otherNum" label="其他变压器数量" type="number" required :rules="[{ required: othershow, message:'请输入其他变压器数量' }]" label-width="140" input-align="right" placeholder="请输入" />
                 <van-field v-model="form.useYear" required :rules="[{ required: true, message:'请选择变压器最早投运年限' }]" label="变压器最早投运年限(年)" label-width="140" input-align="right" placeholder="请输入" is-link readonly @click="handelClickYear('useYear')" />
+                <van-field 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.numNo0 v-model="form.distributeCapacity" label="总额定容量(kVA)" type="number" name="distributeCapacity" required :rules="[{ required: true, message:'请填写总额定容量' }]" label-width="100" input-align="right" placeholder="请输入" />
     
@@ -175,6 +180,10 @@
     
         </VanPickerNew>
     
+        <!-- 年份选择 -->
+        <van-popup v-model="datePicker" position="bottom">
+            <van-datetime-picker v-model="currentDate" type="date"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
     </div>
   </van-form>
     
@@ -231,15 +240,20 @@ export default {
                 distributeModiy: '', //是否进行过设备改造
                 modifyMode: '', //改造方式
                 modifyYear: '', //台区新增扩容改造年份
+                s15AboveNum: '',
+                s14Num: '',
                 s13Num: '',
                 s12Num: '',
                 s11Num: '',
                 s10Num: '',
                 s9Num: '',
+                s8Num: '',
+                s7BelowNum: '',
                 otherNum: '',
                 useYear:'',
                 makeModifyYear:'',
                 addModifyYear:'',
+                produceDate:''
             },
             //页面展示的中文名称
             formColumns: {
@@ -257,15 +271,31 @@ export default {
              */
             handelClcikTrShow: false,
             trName: '',
+            s15show: false,
+            s14show: false,
             s13show: false,
             s12show: false,
             s11show: false,
             s10show: false,
             s9show: false,
-            otherShow: false,
+            s8show: false,
+            s7show: false,
+            othershow: false,
 
             //变压器类型数组
-            trTypeList: [{
+            // trTypeList: [],
+            trTypeList: [
+                {
+                    text: 's15',
+                    title:'s15AboveNum',
+                    value: '9',
+                    checked: false,
+                },{
+                    text: 's14',
+                    title:'s14Num',
+                    value: '10',
+                    checked: false,
+                },{
                     text: 's13',
                     title:'s13Num',
                     value: '1',
@@ -295,6 +325,18 @@ export default {
                     value: '5',
                     checked: false,
                 },
+                {
+                    text: 's8',
+                    title:'s8Num',
+                    value: '8',
+                    checked: false,
+                },
+                {
+                    text: 's7',
+                    title:'s7BelowNum',
+                    value: '7',
+                    checked: false,
+                },
                 {
                     text: '其他',
                     title:'otherNum',
@@ -525,12 +567,16 @@ export default {
           this.handelClcikTrShow =  false
           this.deviceTypeShow = false
           this.trName =  ''
+          this.s15show =  false
+          this.s14show =  false
           this.s13show =  false
           this.s12show =  false
           this.s11show =  false
           this.s10show =  false
           this.s9show =  false
-          this.otherShow =  false
+          this.s8show =  false
+          this.s7show =  false
+          this.othershow =  false
           this.v2Show = false
           this.resultTrList = []
           this.resultTrSpliceList = []
@@ -634,126 +680,25 @@ export default {
          * editData变压器
          */
         editDataTrName() {
-            if (this.form.s13Num) {
-                this.s13show = true
-                this.resultTrList.push({
-                    text: 's13',
-                    title:'s13Num',
-                    value: '1',
-                    checked: true,
-                })
-            }
-
-            if (this.form.s12Num) {
-                this.s12show = true
-                this.resultTrList.push({
-                    text: 's12',
-                    title:'s12Num',
-                    value: '2',
-                    checked: true,
-                })
-            }
-
-            if (this.form.s11Num) {
-                this.s11show = true
-                this.resultTrList.push({
-                    text: 's11',
-                    title:'s11Num',
-                    value: '3',
-                    checked: true,
-                })
-            }
-
-            if (this.form.s10Num) {
-                this.s10show = true
-                this.resultTrList.push({
-                    text: 's10',
-                    title:'s10Num',
-                    value: '4',
-                    checked: true,
-                })
-            }
-
-            if (this.form.s9Num) {
-                this.s9show = true
-                this.resultTrList.push({
-                    text: 's9',
-                    title:'s9Num',
-                    value: '5',
-                    checked: true,
-                })
-            }
-
-            if (this.form.otherNum) {
-                this.otherShow = true
-                this.resultTrList.push({
-                    text: '其他',
-                    title:'otherNum',
-                    value: '6',
-                    checked: true,
-                })
-            }
-
-            if (!this.form.s13Num) {
-                this.s13show = false
-                this.resultTrSpliceList.push({
-                    text: 's13',
-                    title:'s13Num',
-                    value: '1',
-                    checked: false,
-                })
-            }
-
-            if (!this.form.s12Num) {
-                this.s12show = false
-                this.resultTrSpliceList.push({
-                    text: 's12',
-                    title:'s12Num',
-                    value: '2',
-                    checked: false,
-                })
-            }
-
-            if (!this.form.s11Num) {
-                this.s11show = false
-                this.resultTrSpliceList.push({
-                    text: 's11',
-                    title:'s11Num',
-                    value: '3',
-                    checked: false,
-                })
-            }
-
-            if (!this.form.s10Num) {
-                this.s10show = false
-                this.resultTrSpliceList.push({
-                    text: 's10',
-                    title:'s10Num',
-                    value: '4',
-                    checked: false,
-                })
-            }
-
-            if (!this.form.s9Num) {
-                this.s9show = false
-                this.resultTrSpliceList.push({
-                    text: 's9',
-                    title:'s9Num',
-                    value: '5',
-                    checked: false,
-                })
-            }
-
-            if (!this.form.otherNum) {
-                this.otherShow = false
-                this.resultTrSpliceList.push({
-                    text: '其他',
-                    title:'otherNum',
-                    value: '6',
-                    checked: false,
-                })
-            }
+            this.trTypeList.map(item => {
+                console.log(item, 'item');
+                let key = item.value=='6'?'other':item.text
+                console.log(key, this.form[key]);
+                if(this.form[item.title]){
+                    this[key+'show'] = true
+                    this.resultTrList.push({...item,
+                        checked: true,
+                    })
+                }else {
+                    this[key+'show'] = false
+                    this.resultTrSpliceList.push({...item,
+                        checked: false,
+                    })
 
+                }
+            })
+            console.log(this.resultTrSpliceList, this.resultTrList, 'pppppppppppp');
+           
             this.trName = this.resultTrList.map((ele) => ele.text).join(',')
             this.form.transformerType = this.resultTrList.map((ele) => ele.value).join(',')
 
@@ -970,50 +915,23 @@ export default {
             this.trName = trName.map((ele)=> ele.text).join(',')
             this.form.transformerType = trName.map((ele)=> ele.value).join(',')
             this.resultTrList.forEach((v) => {
-                if (v.text == 's13' && v.checked) {
-                    this.s13show = true
-                }
-                if (v.text == 's12' && v.checked) {
-                    this.s12show = true
-                }
-                if (v.text == 's11' && v.checked) {
-                    this.s11show = true
-                }
-                if (v.text == 's10' && v.checked) {
-                    this.s10show = true
-                }
-                if (v.text == 's9' && v.checked) {
-                    this.s9show = true
-                }
-                if (v.text == '其他' && v.checked) {
-                    this.otherShow = true
-                }
+                this.trTypeList.map(ele => {
+                    let key = ele.value=='6'?'other':ele.text
+                    if(v.text == ele.text&&v.checked){
+                        this[key+'show']=true
+                    }
+                })
             })
             this.resultTrSpliceList.forEach((v) => {
-                if (v.text == 's13' && !v.checked) {
-                    this.s13show = false
-                    this.form.s13Num = ''
-                }
-                if (v.text == 's12' && !v.checked) {
-                    this.s12show = false
-                    this.form.s12Num = ''
-                }
-                if (v.text == 's11' && !v.checked) {
-                    this.s11show = false
-                    this.form.s11Num = ''
-                }
-                if (v.text == 's10' && !v.checked) {
-                    this.s10show = false
-                    this.form.s10Num = ''
-                }
-                if (v.text == 's9' && !v.checked) {
-                    this.s9show = false
-                    this.form.s9Num = ''
-                }
-                if (v.text == '其他' && !v.checked) {
-                    this.otherShow = false
-                    this.form.otherNum = ''
-                }
+                
+                this.trTypeList.map(ele => {
+                    let key = ele.value=='6'?'other':ele.text
+                    if(v.text == ele.text&&!v.checked){
+                        this[key+'show']=false
+                        this.form[ele.title]=''
+                    }
+                })
+                
             })
             
             this.handelClcikTrShow = false
@@ -1222,4 +1140,8 @@ export default {
     color: #ee0a24;
     font-size: 12px;
 }
+.content-main{
+    height: calc(100% - 40px);
+    overflow: auto;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/facilityManage/components/fissionAir.vue b/src/views/facilityManage/components/fissionAir.vue
index 1d99677..4d57c78 100644
--- a/src/views/facilityManage/components/fissionAir.vue
+++ b/src/views/facilityManage/components/fissionAir.vue
@@ -7,6 +7,7 @@
                   <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" required :rules="[{ required: true }]" 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-input.num v-model="form.dieoutNum" type="number" label="淘汰设备数量" placeholder="请输入" required :rules="[{ required: true }]" label-width="200"  input-align="right"/> -->
               </van-cell-group>
           </div>
           <!-- <div class="bottom"><van-button type="primary" block>保存</van-button></div> -->
@@ -26,7 +27,8 @@ export default {
                 loadFactor: '',
                 runHours:'',
                 runDays: '',
-                coldPerArea: ''
+                coldPerArea: '',
+                // dieoutNum: ''
             },
             eqid: '',
 
diff --git a/src/views/facilityManage/components/heatingSystem.vue b/src/views/facilityManage/components/heatingSystem.vue
index e05886d..7d2c687 100644
--- a/src/views/facilityManage/components/heatingSystem.vue
+++ b/src/views/facilityManage/components/heatingSystem.vue
@@ -18,6 +18,7 @@
                           validator:validateisData}]" label="输送泵组总功率(kW)" type="number" label-width="140" input-align="right" placeholder="请输入" @input="handelInput('pumpTotalPower', form.pumpTotalPower)" />
   
               <van-field v-model="form.pumpYear" :required="form.heatMode!='1'" :rules="[{ required: form.heatMode!='1'}]"  label="输送泵组设备年份" label-width="140" input-align="right" placeholder="请选择" is-link readonly @click="handelClickYear('pumpYear', 'SET_HEAT_YEAR')" />
+              <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
   
               <!-- 是否进行过设备改造 -->
   
@@ -152,6 +153,10 @@
   
       </VanPickerNew>
   
+        <!-- 年份选择 -->
+        <van-popup v-model="datePicker" position="bottom">
+            <van-datetime-picker v-model="currentDate" type="date"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
     </div>
   </van-form>
 </template>
@@ -222,6 +227,8 @@ export default {
                 modifyMode: '', //改造方式
                 heatIntellectModifyYear: '', //增加主机智能化集中控制系统年份
                 heatModifyYear: '', //更换高能效设备年份
+                produceDate: '',
+                
             },
             //展示名称
             formColumns: {
diff --git a/src/views/facilityManage/components/hotWaterSystem.vue b/src/views/facilityManage/components/hotWaterSystem.vue
index f6e90bf..da4910f 100644
--- a/src/views/facilityManage/components/hotWaterSystem.vue
+++ b/src/views/facilityManage/components/hotWaterSystem.vue
@@ -10,6 +10,7 @@
                   <div class="tips" v-if="tips0 == true">35℃ ≤设定水温≤100℃</div>
                   <!-- <van-field v-model="form.useYear" label="变压器投运年限(年)" label-width="140" input-align="right" placeholder="请输入" is-link readonly @click="handelClickYear('useYear')" /> -->
                   <van-field v-model="formColumns.deviceTypeName" label="热水设备类型" required :rules="[{ required: true, message:'请选择热水设备类型' }]" input-align="right" placeholder="请选择" readonly is-link @click="deviceTypeShow = !showForm" />
+                  <van-field label="设备能效等级" v-model="form.equipEfficiencyName" required :rules="[{  required: true }]" placeholder="请选择设备能效等级" input-align="right" is-link  readonly @click="handelClickOptionShow('equipEfficiency')" />
                   <!-- 是否进行过设备改造 -->
                   <Whether required :rules="[{ required: true, message:'请选择设备改造' }]" :value="formColumns.waterModiyName" @onConfirmTrueFalse="onConfirmTrueFalse" feildName="waterModiy" special="1" />
                   <!-- 改造方式 -->
@@ -85,8 +86,8 @@
             </div>
         </VanPickerNew>
         </div>
+       <VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
     </van-form>
-    
 </template>
 
 <script>
@@ -131,7 +132,8 @@ export default {
                 modifyMode: '', //改造方式
                 modifyYear: '', //增加主机智能化集中控制系统年份
                 useYear: '',
-                intellectModifyYear:''
+                intellectModifyYear:'',
+                equipEfficiency: '',
             },
             //页面展示的中文名称
             formColumns: {
@@ -286,6 +288,7 @@ export default {
             this.edSet = setTimeout(async () => {
                 //前页面存起来的数据
                 const data = this.$store.getters.editData
+                console.log(data, 'data=============');
                 //问询问题
                 const searchInfo = this.$store.getters.searchInfo
                 if (searchInfo) {
@@ -321,14 +324,14 @@ export default {
                                 }
                             }
                         }
+                        let Efficiency = this.form.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == this.form.equipEfficiency)
+                        this.form.equipEfficiencyName = Efficiency&&Efficiency.text
                         if(this.form.modifyYear) {
                           this.modifyYearShow = true
                         }
                         if(this.form.intellectModifyYear) {
                           this.intellectModifyYearShow = true
                         }
-
-                        
                         //判断是否
                         this.editIsTrue()
                         //消耗能源类型
diff --git a/src/views/facilityManage/components/illuminationSystem.vue b/src/views/facilityManage/components/illuminationSystem.vue
index c3a3f5f..bd453cc 100644
--- a/src/views/facilityManage/components/illuminationSystem.vue
+++ b/src/views/facilityManage/components/illuminationSystem.vue
@@ -14,9 +14,9 @@
     
             <van-field v-input.float v-show="incandescentRadioShow" required :rules="[{ required: incandescentRadioShow, message:'请填写占比' }]" v-model="form.incandescentRadio" label="白炽灯占比(%)" type="number" label-width="140" input-align="right" placeholder="请输入" @input="handelChangeNumber('incandescentRadio')" />
     
-            <van-field v-input.float v-show="energySaviRatioShow" required :rules="[{ required: energySaviRatioShow, message:'请填写占比' }]" v-model="form.energySaviRatio" label="节能灯占比(%)" type="number" label-width="140" input-align="right" placeholder="请输入" @input="handelChangeNumber('energySaviRatio')" />
+            <van-field v-input.float v-show="energySaviRatioShow" required :rules="[{ required: energySaviRatioShow, message:'请填写占比' }]" v-model="form.energySaviRatio" label="非LED节能灯占比(%)" type="number" label-width="148" input-align="right" placeholder="请输入" @input="handelChangeNumber('energySaviRatio')" />
             
-            <van-field v-input.float v-show="showOther" required  v-model="form.otherRatio" label="其它占比(%)" type="number" label-width="140" input-align="right" placeholder="请输入" readonly />
+            <van-field v-input.float v-show="showOther" required  v-model="form.otherRatio" label="其它灯具占比(%)" type="number" label-width="140" input-align="right" placeholder="请输入" readonly />
     
             <van-field v-input.numNo0 v-model="form.totalNum" label="合计数量约(盏)" type="number" required :rules="[{ required: true, message: '请填写合计数量' }]" label-width="140" input-align="right" placeholder="请输入" />
     
@@ -133,7 +133,7 @@ export default {
                 ledRatio: '', //LED灯具占比(%)
                 fluorescentRadio: '', //普通荧光灯(%)
                 incandescentRadio: '', //白炽灯占比(%)
-                energySaviRatio: '', //节能灯占比(%)
+                energySaviRatio: '', //非LED节能灯占比(%)
                 totalNum: '', // 合计数量约
                 equipModiy: '', // 是否进行过照明系统改造
                 modifyMode: '', //改造方式
@@ -165,7 +165,7 @@ export default {
                     checked: false,
                 },
                 {
-                    text: '节能灯',
+                    text: '非LED节能灯',
                     value: '4',
                     field: 'energySaviRatio',
                     checked: false,
@@ -177,7 +177,7 @@ export default {
             ledRatioShow: false,
             //普通灯是否展示
             fluorescentRadioShow: false,
-            //节能灯是否展示
+            //非LED节能灯是否展示
             incandescentRadioShow: false,
             //白炽灯是否展示
             energySaviRatioShow: false,
@@ -417,7 +417,7 @@ export default {
             if (this.form.energySaviRatio) {
                 this.energySaviRatioShow = true
                 this.resultCheckbox.push({
-                    text: '节能灯',
+                    text: '非LED节能灯',
                     value: this.form.energySaviRatio,
                     field: 'energySaviRatio',
                     checked: true,
@@ -454,7 +454,7 @@ export default {
             if (!this.form.energySaviRatio) {
                 this.energySaviRatioShow = false
                 this.spliceBox.push({
-                    text: '节能灯',
+                    text: '非LED节能灯',
                     value: this.form.energySaviRatio,
                     field: 'energySaviRatio',
                     checked: false,
@@ -594,7 +594,7 @@ export default {
                 if (v.text == '白炽灯' && v.checked) {
                     this.incandescentRadioShow = true
                 }
-                if (v.text == '节能灯' && v.checked) {
+                if (v.text == '非LED节能灯' && v.checked) {
                     this.energySaviRatioShow = true
                 }
             })
@@ -611,7 +611,7 @@ export default {
                     this.incandescentRadioShow = false
                     this.form.incandescentRadio = ''
                 }
-                if (v.text == '节能灯' && !v.checked) {
+                if (v.text == '非LED节能灯' && !v.checked) {
                     this.energySaviRatioShow = false
                     this.form.energySaviRatio = ''
                 }
diff --git a/src/views/facilityManage/components/multipleAir.vue b/src/views/facilityManage/components/multipleAir.vue
index 8afe360..d4fca9e 100644
--- a/src/views/facilityManage/components/multipleAir.vue
+++ b/src/views/facilityManage/components/multipleAir.vue
@@ -36,6 +36,11 @@
                       <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" required :rules="[{ required: true }]" 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 v-model="form.useExpl" v-input.num label="在用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
+                      <van-field v-model="form.backupExpl" v-input.num label="备用台数(台)" type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入"/>
+                      <van-field 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" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
                     </van-cell-group>
                   <div v-if="form.refrigeNum">
                     <van-cell class="img-box box1" style="padding:10px 15px;" title="设备外观" :required="$store.getters.cityType"/>
@@ -105,6 +110,12 @@
         <!-- <div class="bottom"><van-button type="primary" block>保存</van-button></div> -->
         <VanPickerNew :show="show" :columns="list" :loading="loading" @onConfirm="onConfirm" @onCancel="onCancel" />
         <Year :show="yearShow" :num="1" @onConfirmYear="onConfirmYear" @onCancelYear="onCancelYear" />
+        <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"  :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
+        </van-popup>
     </div>
 </template>
 
@@ -161,7 +172,12 @@ export default {
                 loadFactor: '',
                 runHours:'',
                 runDays: '',
-                coldPerArea: ''
+                coldPerArea: '',
+                useExpl: '',
+                backupExpl: '',
+                equipEfficiency: '',
+                cumulativeRunHours: '',
+                produceDate:''
             },
 
             /**
@@ -347,7 +363,9 @@ export default {
 
                     this.form.conEquipModiy = data.info.conEquipModiy
                     this.formColumns.conEquipModiyName =  data.info.conEquipModiy == 1 ? '是' : '否'
-
+                    console.log(this.form.equipEfficiency, 'data.equipEfficiency');
+                    let Efficiency = this.form.equipEfficiency&&this.equipEfficiencyOption.find(item => item.value == this.form.equipEfficiency)
+                    this.form.equipEfficiencyName = Efficiency&&Efficiency.text
                     if (data.info.conIntellectModifyYear) {
                         this.form.conIntellectModifyYear = data.info.conIntellectModifyYear
                         this.resultList.push({
diff --git a/src/views/facilityManage/index.vue b/src/views/facilityManage/index.vue
index b1d8c8e..0be2558 100644
--- a/src/views/facilityManage/index.vue
+++ b/src/views/facilityManage/index.vue
@@ -202,6 +202,7 @@ export default {
                         if (res.data.nxzdHeatSystemDTO && this.parentPath.split('/facilityManage').length < 2) {
                             this.$store.dispatch('saveList/getHea', res.data.nxzdHeatSystemDTO)
                         }
+                        console.log(res.data, 'res.data==================');
                         const data = {
                             info: res.data,
                             pageKey: this.pageKey,
@@ -318,6 +319,7 @@ export default {
                 pumpNum: '', //	输送泵组台数
                 pumpTotalPower: '', //输送泵组总功率
                 pumpYear: '', //	输送泵组设备年份
+                produceDate: ''
             }
             this.commonForm.operDetailCode =  '' // 用能设备明细类型编号用逗号隔开
         },
@@ -378,7 +380,7 @@ export default {
                     // console.log(cn);
                     // eslint-disable-next-line no-case-declarations
                     const heatObj = this.$refs.component
-
+                    console.log(heatObj, 'heatObj===============');
                     // eslint-disable-next-line no-case-declarations
                     const heatRes = await this.flagNo(heatObj.$refs.heat)
                     flag = heatRes
@@ -475,6 +477,7 @@ export default {
             this.commonForm.nxzdUseEnergyEquipDTO.heatType = store.heatType
 
             this.commonForm.nxzdUseEnergyEquipDTO.heatMode = store.heatMode
+            this.commonForm.nxzdUseEnergyEquipDTO.produceDate = store.produceDate
 
             this.commonForm.nxzdUseEnergyEquipDTO.pumpTotalPower = store.pumpTotalPower||0