wyh 1 year ago
parent
commit
2347fe87fc

+ 28 - 25
src/views/module_base/energyRate/modules/EnergyRateForm.vue

@@ -64,12 +64,12 @@
 
         <template slot="begintime" slot-scope="text, record,index">
             <a-form-model-item :prop="'data.'+index+'.begintime'" :rules="validatorRules.begintime2" style="margin-bottom: 0px;">
-              <a-time-picker date-format="HH:mm:ss" placeholder="请选择分时开始时间" v-model="record.begintime" style="width: 100%" />
+              <a-time-picker format="HH:mm:ss" placeholder="请选择分时开始时间" v-model="record.begintime" style="width: 100%" />
             </a-form-model-item>
         </template>
         <template slot="endtime" slot-scope="text, record,index">
             <a-form-model-item :prop="'data.'+index+'.endtime'" :rules="validatorRules.endtime2" style="margin-bottom: 0px;">
-              <a-time-picker date-format="HH:mm:ss" placeholder="请选择分时结束时间" v-model="record.endtime" style="width: 100%" />
+              <a-time-picker format="HH:mm:ss" placeholder="请选择分时结束时间" v-model="record.endtime" style="width: 100%" />
             </a-form-model-item>
         </template>
         <template slot="pandv" slot-scope="text, record,index">
@@ -183,30 +183,30 @@
           //  rateunit: [
           //     { required: true, message: '请输入单位!'},
           //  ],
-           begintime: [
+            begintime: [
               { required: true, message: '请输入费率有效期开始!'},
-           ],
-           endtime: [
+            ],
+            endtime: [
               { required: true, message: '请输入费率有效期结束!'},
-           ],
-           begintime2: [
-            { required: true, message: '请选择分时开始时间!'},
-          ],
-          endtime2: [
-            { required: true, message: '请选择分时结束时间!'},
-          ],
-          pandv: [
-            { required: true, message: '请选择峰平谷!'},
-          ],
-          price: [
-            { required: true, message: '请输入价格!'},
-          ],
-          beginamount: [
-            { required: true, message: '请输入起始量!'},
-          ],
-          endamount: [
-            { required: true, message: '请输入结束量!'},
-          ],
+            ],
+            begintime2: [
+              { required: true, message: '请选择分时开始时间!'},
+            ],
+            endtime2: [
+              { required: true, message: '请选择分时结束时间!'},
+            ],
+            pandv: [
+              { required: true, message: '请选择峰平谷!'},
+            ],
+            price: [
+              { required: true, message: '请输入价格!'},
+            ],
+            beginamount: [
+              { required: true, message: '请输入起始量!'},
+            ],
+            endamount: [
+              { required: true, message: '请输入结束量!'},
+            ],
         },
         // validatorListRules: {
         //   begintime: [
@@ -234,7 +234,7 @@
         tableKeys:['baseEnergyRateDetail', ],
         activeKey: 'baseEnergyRateDetail',
         // base_energy_rate_detail
-        // model: {
+        // baseEnergyRateDetailTable: {
         //   loading: false,
         //   data: [],
         //   columns1: []
@@ -402,6 +402,7 @@
             endamount: ''
           })
           this.count++
+          console.log(this.model.data)
         } 
         if (value == 2) {
           this.ratetype = value
@@ -448,6 +449,7 @@
             endamount: ''
           })
           this.count++
+          console.log(this.model.data)
         }
       },
       // 创建一条新数据
@@ -466,6 +468,7 @@
             endamount: ''
           })
           this.count++
+          console.log(this.model.data)
         }
       },
       remove(key) {

+ 2 - 2
src/views/module_ems/energyAnalyse/meterReadData/index.vue

@@ -150,8 +150,8 @@ export default {
         },
       ],
       url: {
-        list: '/ems/emselectricity/liststa',
-        exportXlsUrl: '/ems/emselectricity/exportXls',
+        list: '/dataElectricity/dataElectricity/liststa',
+        exportXlsUrl: '/dataElectricity/dataElectricity/exportsta',
       },
       superFieldList: [],
       dataSource: [],