淘汰数量、二氧化碳系数

.env.development

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

.env.production

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

src/api/config.js

@@ -16,10 +16,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

@@ -12,7 +12,7 @@ module.exports = {
   menuExclude: [],
   // ${process.env.VUE_APP_BASE_API}
   // https://portal.xt.nfjbill.ren:30004
-  downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-ah/file/minio/download/`,
+  downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-sx/file/minio/download/`,
   // downloadUrl: `https://www.greensgcc.com/proxy-xj/file/minio/download/`,
   // downloadUrl: `http://172.29.69.38:19012/proxy-sx/file/minio/download/`,
   uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`,

src/store/getters.js

@@ -28,6 +28,7 @@ export default {
   cityIsNx: state => state.user.cityIsNx,
   imageRecognition: state => state.user.imageRecognition,
   validate: state => state.user.validate,
+  cityisXj: state => state.user.cityisXj,
   /**
    * 询问的数据
    */

src/store/module/user.js

@@ -41,6 +41,7 @@ const getDefaultState = () => ({
   cityIsNx: process.env.VUE_APP_CITY_TYPE=='nx',  //宁夏特供-公共机构配电获取
   imageRecognition: process.env.VUE_APP_CITY_TYPE=='ah', // 图像识别
   validate: process.env.VUE_APP_CITY_TYPE=='ah', // 大区间校验
+  cityisXj: process.env.VUE_APP_CITY_TYPE=='xj', // 报告-二氧化碳系数
 })
 
 const state = getDefaultState()

src/views/energyEfficiency/InitiateAppointment.vue

@@ -41,7 +41,7 @@
     
         <van-popup v-model="datePicker" position="bottom">
     
-            <van-datetime-picker v-model="currentDate" type="date"  :min-date="minDate" @confirm="onConfirm" @cancel="datePicker = false" />
+            <van-datetime-picker v-model="currentDate" type="date"  :min-date="minDate" :max-date="maxDate" @confirm="onConfirm" @cancel="datePicker = false" />
     
         </van-popup>
     
@@ -49,7 +49,7 @@
     
         <van-popup v-model="datePicker2" position="bottom">
     
-            <van-datetime-picker v-model="currentDate2" type="date" :min-date="minDate" @confirm="onConfirm2" @cancel="datePicker2 = false" />
+            <van-datetime-picker v-model="currentDate2" type="date" :min-date="minDate2" @confirm="onConfirm2" @cancel="datePicker2 = false" />
     
         </van-popup>
     
@@ -82,6 +82,16 @@ export default {
             computedTime: "请选择"
         };
     },
+    computed:{
+        maxDate(){
+            const now = new Date()
+            return new Date(now.getFullYear(), 11, 31)
+        },
+        minDate2(){
+            return new Date(this.currentDate)
+        },
+
+    },
     created() {
         let customer = sessionStorage.getItem("customer");
         let customerMsg = JSON.parse(customer)
@@ -109,6 +119,10 @@ export default {
             d = d < 10 ? "0" + d : d;
             this.dateTime = y + "-" + m + "-" + d;
             this.datePicker = false;
+            if (this.computedTime&&!(Date.parse(this.computedTime) > Date.parse(this.dateTime))) {
+                console.log('true');
+                this.computedTime = '请选择'
+            }
         },
         // 日期选择赋值
         onConfirm2(val) {

src/views/facilityManage/bursting/burstingDetail.vue

@@ -26,6 +26,7 @@
                         <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-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" />
@@ -65,6 +66,7 @@
                         <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-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" />
@@ -99,6 +101,7 @@
                         <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-field v-input.num v-model="form1.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" />
@@ -228,7 +231,8 @@ export default {
                 coldPerArea: '',
                 equipEfficiency: '',
                 produceDate:'',
-                cumulativeRunHours: ''
+                cumulativeRunHours: '',
+                dieoutNum: ''
             },
             form1: {
                 equipId:'',
@@ -251,7 +255,8 @@ export default {
                 heatPerArea: '',
                 equipEfficiency: '',
                 produceDate:'',
-                cumulativeRunHours: ''
+                cumulativeRunHours: '',
+                dieoutNum: ''
             },
             formColumns: {
                 refrigeType: "",
@@ -772,6 +777,7 @@ export default {
                       ele.ratedPower = this.edgl + "," + this.hyl
                       // ele.unitType = this.form.refrigeType
                       ele.unitType = this.form1.unitType
+                      ele.dieoutNum = this.form1.dieoutNum
                       ele.unitTypeName = this.formColumns.refrigeTypeName
                       return ele
                     }
@@ -791,7 +797,6 @@ export default {
                   this.form1.unitType = this.formColumns.refrigeType
                   this.form1.unitTypeName = this.formColumns.refrigeTypeName
                   this.heatPicArrtoStr()
-                  console.log(this.form1.unitType, 'this.form1.unitType');
                   this.$store.getters.heatingUnitList.push(this.form1)
                   this.clearPage()
                   this.$router.push({

src/views/facilityManage/components/distributionSystem.vue

@@ -21,6 +21,7 @@
                 <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" 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="请输入" 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="请输入" />
     
@@ -257,6 +258,7 @@ export default {
                 addModifyYear:'',
                 produceDate:'',
                 equipEfficiency: '',
+                dieoutNum: '',
             },
             //页面展示的中文名称
             formColumns: {

src/views/facilityManage/components/fissionAir.vue

@@ -3,6 +3,7 @@
           <div class="fissionItem">
               <van-cell-group>
                   <van-field v-model="form.refrigeNum" v-input.numNo0 label="空调数量"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
+                  <van-field v-model="form.dieoutNum" v-input.num label="淘汰设备数量"  type="number" required :rules="[{ required: true }]" input-align="right" placeholder="请输入" />
                   <van-field 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" 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="请输入" />
@@ -28,7 +29,7 @@ export default {
                 runHours:'',
                 runDays: '',
                 coldPerArea: '',
-                // dieoutNum: ''
+                dieoutNum: ''
             },
             eqid: '',
 

src/views/facilityManage/components/multipleAir.vue

@@ -41,6 +41,7 @@
                       <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-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 v-if="form.refrigeNum">
                     <van-cell class="img-box box1" style="padding:10px 15px;" title="设备外观" :required="$store.getters.cityType"/>
@@ -177,7 +178,8 @@ export default {
                 backupExpl: '',
                 equipEfficiency: '',
                 cumulativeRunHours: '',
-                produceDate:''
+                produceDate:'',
+                dieoutNum: ''
             },
 
             /**

src/views/industrialReport/components/utilizeDetail.vue

@@ -23,6 +23,7 @@
               <th>名称</th>
               <th>实物量</th>
               <th>折标量(吨折煤)</th>
+              <th v-if="cityisXj">二氧化碳系数(千克)</th>
             </tr>
           </thead>
           <tbody>
@@ -31,48 +32,56 @@
               <td>外购电</td>
               <td>{{ enterpriseEnergy81['电'].val }}(千瓦时)</td>
               <td>{{ enterpriseEnergy81['电'].standardVal }}</td>
+              <td v-if="cityisXj"></td>
             </tr>
             <tr>
               <td>2</td>
               <td>天然气</td>
               <td>{{ enterpriseEnergy81['天然气'].val }}(立方米)</td>
               <td>{{ enterpriseEnergy81['天然气'].standardVal }}</td>
+              <td v-if="cityisXj">{{ enterpriseEnergy81['天然气'].co2 }}</td>
             </tr>
             <tr>
               <td>3</td>
               <td>外购低压蒸汽</td>
               <td>{{ enterpriseEnergy81['低压蒸汽'].val }}(吨)</td>
               <td>{{ enterpriseEnergy81['低压蒸汽'].standardVal }}</td>
+              <td v-if="cityisXj"></td>
             </tr>
             <tr>
               <td>4</td>
               <td>外购中压蒸汽</td>
               <td>{{ enterpriseEnergy81['中压蒸汽'].val }}(吨)</td>
               <td>{{ enterpriseEnergy81['中压蒸汽'].standardVal }}</td>
+              <td v-if="cityisXj"></td>
             </tr>
             <tr>
               <td>5</td>
               <td>外购高压蒸汽</td>
               <td>{{ enterpriseEnergy81['高压蒸汽'].val }}(吨)</td>
               <td>{{ enterpriseEnergy81['高压蒸汽'].standardVal }}</td>
+              <td v-if="cityisXj"></td>
             </tr>
             <tr>
               <td>6</td>
               <td>煤</td>
               <td>{{ enterpriseEnergy81['煤'].val }}(吨)</td>
               <td>{{ enterpriseEnergy81['煤'].standardVal }}</td>
+              <td v-if="cityisXj">{{ enterpriseEnergy81['煤'].co2 }}</td>
             </tr>
             <tr>
               <td>7</td>
               <td>汽油</td>
               <td>{{ enterpriseEnergy81['汽油'].val }}(吨)</td>
               <td>{{ enterpriseEnergy81['汽油'].standardVal }}</td>
+              <td v-if="cityisXj">{{ enterpriseEnergy81['汽油'].co2 }}</td>
             </tr>
             <tr>
               <td>8</td>
               <td>柴油</td>
               <td>{{ enterpriseEnergy81['柴油'].val }}(吨)</td>
               <td>{{ enterpriseEnergy81['柴油'].standardVal }}</td>
+              <td v-if="cityisXj">{{ enterpriseEnergy81['柴油'].co2 }}</td>
             </tr>
           </tbody>
         </table>
@@ -150,7 +159,7 @@
 
 <script>
 import commonTitle from './commonTitle.vue'
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -198,11 +207,12 @@ export default {
           }
         ]
       },
-      improveList:[]
+      improveList:[],
     }
   },
   components: { commonTitle },
   computed: {
+    ...mapGetters(['cityisXj']),
     ...mapState('report', ['EnergyReportInfo']),
     enterpriseEnergy81() {
       if (this.EnergyReportInfo.enterpriseEnergy81) {