填报增加字段

.env.production

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

src/api/config.js

@@ -10,10 +10,10 @@ 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-sx' //山西 打包以后的路径
   // baseURL = '/proxy-cq' //重庆 打包以后的路径
 }
 

src/settings.js

@@ -10,7 +10,7 @@ module.exports = {
    */
   sidebarLogo: true,
   menuExclude: [],
-  downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-sx/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/views/energyEfficiency/constructionInfo.vue

@@ -998,6 +998,10 @@ export default {
                             //         ele.disabled = false
                             //     }
                             // })
+                          }else{
+                              this.showData.buildType1 =  this.option[i].text
+                              this.mainActiveIndex = i
+
                           }
                       }
                       
@@ -1273,27 +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
-                            const list = v.child.map((ele) => {
+                            let list = []
+                            if(v.child){
+                            list = v.child.map((ele) => {
                                 return {
                                     text: ele.name,
                                     id: ele.code,
                                     pCode: ele.pCode
                                 }
                             })
+                                
+                            }
                             arr.push({
                                 text: v.name,
                                 value: v.code,
-                                children: list,
+                                children: list||[],
-                                disabled: select!=5&&!(v.code == select)
+                                disabled: select!=6&&!(v.code == select)
                             })
                         })
+                        console.log(arr, 'arrooo', this.option);
                         this.option = arr
                     }
                 })
                 .catch(() => {
+                    console.log('shibai');
                     this.$toast('失败')
                 })
         },

src/views/facilityManage/bursting/burstingDetail.vue

@@ -28,6 +28,10 @@
                         <van-field label="设备生产日期" v-model="form.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
                         <van-field v-input.num v-model="form.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
                         <van-field v-input.num v-model="form.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.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="请输入"  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" />
@@ -51,7 +55,7 @@
                 <!-- 设备类型选择 -->
                 <div class="inputStyle">
                     <van-cell-group>
-                        <van-field v-model="formColumns.refrigeTypeName" label="设备类型1" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" @click="handelClickHeatingShow('jzlx', 80000001016,'refrigeTypeName','refrigeType','lqt' )" readonly />
+                        <van-field v-model="formColumns.refrigeTypeName" label="设备类型" required :rules="[{ required: true }]" input-align="right" is-link placeholder="请选择" @click="handelClickHeatingShow('jzlx', 80000001016,'refrigeTypeName','refrigeType','lqt' )" readonly />
                         <!-- <van-cell  title="设备类型" is-link :value="form.refrigeTypeName"  @click="showPicker = true" readonly /> -->
                         <van-field v-model="form.model" label="设备型号"  required :rules="[{  required: true },{pattern:/^.{2,30}$/, message:'2≤型号长度≤30'}]" input-align="right" maxlength="30" placeholder="请输入设备型号"/>
                         <van-field v-model="refrigeNum" v-input.numNo0 label="数量(台)" readonly type="number" required :rules="[{ required: true }]" input-align="right" placeholder="自动计算" />
@@ -104,6 +108,9 @@
                         <van-field label="设备生产日期" v-model="form1.produceDate" required :rules="[{  required: true }]" placeholder="请选择设备生产日期" input-align="right" is-link  readonly @click="datePicker = true" />
                         <van-field v-input.num v-model="form1.cumulativeRunHours" required :rules="[{  required: true }]" type="number" label="累计运行小时数" placeholder="请输入" label-width="200"  input-align="right"/>
                         <van-field v-input.num v-model="form1.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" />
@@ -240,7 +247,11 @@ export default {
                 equipEfficiency: '',
                 produceDate:'',
                 cumulativeRunHours: '',
-                dieoutNum: ''
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+                centralAirConditionerCop:'',
             },
             form1: {
                 equipId:'',
@@ -264,7 +275,11 @@ export default {
                 equipEfficiency: '',
                 produceDate:'',
                 cumulativeRunHours: '',
-                dieoutNum: ''
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+
             },
             formColumns: {
                 refrigeType: "",
@@ -868,6 +883,18 @@ export default {
                 exteriorImage: "", //设备外观
                 tagImage: "", //设备铭牌
                 markImage: "", //设备能效标识
+                loadFactor: '',
+                runHours:'',
+                runDays: '',
+                coldPerArea: '',
+                equipEfficiency: '',
+                produceDate:'',
+                cumulativeRunHours: '',
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+                centralAirConditionerCop:'',
             };
             this.form1 = {
                 equipId:'',
@@ -882,6 +909,18 @@ export default {
                 exteriorImage: "", //设备外观
                 tagImage: "", //设备铭牌
                 markImage: "", //设备能效标识
+                loadFactor: '',
+                runHours:'',
+                runDays: '',
+                heatPerArea: '',
+                equipEfficiency: '',
+                produceDate:'',
+                cumulativeRunHours: '',
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+
             };
             this.formColumns = {
                 refrigeType: "",

src/views/facilityManage/components/distributionSystem.vue

@@ -28,6 +28,9 @@
                 <van-field v-input.float v-model="form.maxNeed" required :rules="[{ required: true}]" label="最大需量(kW)" type="number" input-align="right" placeholder="请输入" @input="changeTips" />
                 <div class="tips" v-if="tips0">最大需量≤总额定容量</div>
                 <van-field v-input.allFloat v-model="form.penaltyAmount" required :rules="[{ required: true}]" label="上一年累计度力调电费的惩罚金额（元）" type="number" label-width="220" input-align="right" placeholder="请输入" />
+                <van-field v-input.float v-model="form.saveElectricity" type="number" label="预期年节电量（千瓦时）" placeholder="请输入" label-width="220"  input-align="right"/>
+                <van-field v-input.float v-model="form.carbonEmissionFactor" type="number" label="区域碳排放因子" placeholder="请输入" label-width="200"  input-align="right"/>
+                <van-field v-input.float v-model="form.carbonReduction" type="number" label="预期减碳量（TCO₂）" placeholder="请输入" label-width="200"  input-align="right"/>
 
                 <Whether :value="formColumns.chargingName" feildName="charging" title="是否安装新能源充电桩" @onConfirmTrueFalse="onConfirmTrueFalse" />
 
@@ -259,6 +262,9 @@ export default {
                 produceDate:'',
                 equipEfficiency: '',
                 dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
             },
             //页面展示的中文名称
             formColumns: {

src/views/facilityManage/components/fissionAir.vue

@@ -9,6 +9,9 @@
                   <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-field v-input.float v-model="form.saveElectricity" type="number" label="预期年节电量（千瓦时）" placeholder="请输入" label-width="220"  input-align="right"/>
+                  <van-field v-input.float v-model="form.carbonEmissionFactor" type="number" label="区域碳排放因子" placeholder="请输入"  label-width="200"  input-align="right"/>
+                  <van-field v-input.float v-model="form.carbonReduction" type="number" label="预期减碳量（TCO₂）" placeholder="请输入"  label-width="200"  input-align="right"/>
                 </van-cell-group>
           </div>
           <!-- <div class="bottom"><van-button type="primary" block>保存</van-button></div> -->
@@ -29,7 +32,10 @@ export default {
                 runHours:'',
                 runDays: '',
                 coldPerArea: '',
-                dieoutNum: ''
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
             },
             eqid: '',
 

src/views/facilityManage/components/multipleAir.vue

@@ -43,6 +43,10 @@
                       <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-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.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-cell-group>
                   <div v-if="form.refrigeNum">
                     <van-cell class="img-box box1" style="padding:10px 15px;" title="设备外观" :required="$store.getters.cityType"/>
@@ -181,7 +185,11 @@ export default {
                 equipEfficiency: '',
                 cumulativeRunHours: '',
                 produceDate:'',
-                dieoutNum: ''
+                dieoutNum: '',
+                saveElectricity: '',
+                carbonEmissionFactor:'',
+                carbonReduction:'',
+                multiAirConditionerCop:''
             },
 
             /**