能源bug

src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue

@@ -4,38 +4,23 @@
       <el-col :span='12'>
         <el-form-item label="能源类型" prop="energyTypeId">
           <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
-            <el-option
+            <el-option v-for="item in this.energyTypeList" :key="item.id" :label="item.name" :value="item.id">
-              v-for="item in this.energyTypeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span='12'>
         <el-form-item label="抄表日期" prop="recordTime">
-          <el-date-picker
+          <el-date-picker v-model="form.recordTime" type="date" format="yyyy-MM-dd" value-format="timestamp"
-            v-model="form.recordTime"
+            placeholder="选择日期" style="width: 100%;">
-            type="date"
-            format="yyyy-MM-dd"
-            value-format="timestamp"
-            placeholder="选择日期"
-            style="width: 100%;">
           </el-date-picker>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span='24'>
-        <base-table
+        <base-table border :table-props="tableProps" :table-data="tableData" :add-button-show="addButtonShow"
-          border
+          @emitFun="inputChange" @emitButtonClick="emitButtonClick" />
-          :table-props="tableProps"
-          :table-data="tableData"
-          :add-button-show="addButtonShow"
-          @emitFun="inputChange"
-          @emitButtonClick="emitButtonClick"
-        />
       </el-col>
     </el-row>
   </el-form>
@@ -48,15 +33,15 @@ import SelectArea from './SelectArea'
 const tableProps = [
   {
     prop: 'tableName',
-      label: '表名',
+    label: '表名*',
     subcomponent: SelectArea
   },
   {
     prop: 'readingQuantity',
-      label: '抄表数',
+    label: '抄表数*',
     subcomponent: InputArea
   }
-  ]
+]
 export default {
   name: 'EnergyQuantityManualAdd',
   props: {
@@ -72,7 +57,7 @@ export default {
     return {
       tableProps,
       tableData: [],
-      addButtonShow:'新增',
+      addButtonShow: '新增',
       form: {
         id: '',
         energyTypeId: '',
@@ -98,16 +83,16 @@ export default {
         obj.tableName = params.tableName + ''
         obj.readingQuantity = 0
         this.tableData.push(obj)
-      }else {
+      } else {
         this.isEdit = true
         this.form.id = params.id
         this.addButtonShow = ''
-        energyQuantityManualGet({id: this.form.id}).then(res => {
+        energyQuantityManualGet({ id: this.form.id }).then(res => {
           if (res.code === 0) {
             this.form.energyTypeId = res.data.energyTypeId
             this.form.recordTime = res.data.recordTime ? res.data.recordTime : null
             let obj = {}
-            obj.tableName = res.data.tableName ? res.data.tableName+'' : ''
+            obj.tableName = res.data.tableName ? res.data.tableName + '' : ''
             obj.readingQuantity = res.data.readingQuantity
             this.tableData.push(obj)
           }
@@ -130,10 +115,10 @@ export default {
           if (this.tableData.length === 0) {
             this.$modal.msgError("抄表数据不能为空");
             return false
-          }else{
+          } else {
             for (let item of this.tableData) {
               console.log(item)
-              if (!item.tableName || (!item.readingQuantity && item.readingQuantity!==0)) {
+              if (!item.tableName || (!item.readingQuantity && item.readingQuantity !== 0)) {
                 this.$modal.msgError("抄表数据有空值，请检查");
                 return false
               }
@@ -142,11 +127,11 @@ export default {
           if (this.isEdit) {
             // 编辑
             energyQuantityManualUpdate({
-              id:this.form.id,
+              id: this.form.id,
-              energyTypeId:this.form.energyTypeId,
+              energyTypeId: this.form.energyTypeId,
-              recordTime:this.form.recordTime,
+              recordTime: this.form.recordTime,
-              tableName:this.tableData[0].tableName,
+              tableName: this.tableData[0].tableName,
-              readingQuantity:this.tableData[0].readingQuantity
+              readingQuantity: this.tableData[0].readingQuantity
             }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
@@ -155,9 +140,9 @@ export default {
             })
           } else {
             energyQuantityManualCreate({
-              energyTypeId:this.form.energyTypeId,
+              energyTypeId: this.form.energyTypeId,
-              recordTime:this.form.recordTime,
+              recordTime: this.form.recordTime,
-              data:this.tableData
+              data: this.tableData
             }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");

src/views/energy/base/energyQuantityManual/index.vue

@@ -185,7 +185,7 @@ export default {
           break
         default:
           this.$modal.confirm('是否确认导出').then(() => {
-            return energyQuantityManualExport({ ...this.queryParams });
+            return energyQuantityManualExport({ energyTypeId: this.queryParams.energyTypeId, recordTime: this.queryParams.recordTime });
           }).then(response => {
             this.$download.excel(response, '能源报表.xls');
           }).catch(() => { })

src/views/energy/base/energyQuantityRealtime/index.vue

@@ -2,27 +2,12 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
     <!-- 列表 -->
-    <base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-      :page="queryParams.pageNo"
+      :selectWidth="55" :max-height="tableH" @selection-change="selectChange" />
-      :limit="queryParams.pageSize"
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-      :table-props="tableProps"
+      @pagination="getList" />
-      :table-data="list"
-      :selectWidth="55"
-      :max-height="tableH"
-      @selection-change="selectChange"
-    />
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
   </div>
 </template>
 
@@ -71,7 +56,8 @@ export default {
           type: 'select',
           label: '能源类型',
           selectOptions: [],
-          param: 'energyTypeId'
+          param: 'energyTypeId',
+          filterable: true
         },
         {
           type: 'datePicker',
@@ -129,7 +115,7 @@ export default {
       let arr = location.href.split('?')[1].split('&')
       this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
     } else {
-      this.formConfig[1].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
+      this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()]
     }
     this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
     this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
@@ -146,7 +132,7 @@ export default {
           let arr = location.href.split('?')[1].split('&')
           this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
         } else {
-          this.formConfig[1].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
+          this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()]
         }
         this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
         this.queryParams.endTime = this.formConfig[1].defaultSelect[1]

src/views/energy/base/energyType/components/energyTypeAdd.vue

@@ -127,9 +127,11 @@ export default {
         name: '',
         code: '',
         unit: '',
+        singlePrice: 0,
         pricingMethod: 2,
-        leaderName: '',
+        dim: '',
-        push: false
+        push: false,
+        description: ''
       },
       isEdit: false, //是否是编辑
       rules: {
@@ -162,14 +164,15 @@ export default {
             this.form.code = res.data.code
             this.form.unit = res.data.unit
             this.form.pricingMethod = res.data.pricingMethod
-            this.form.leaderName = res.data.leaderName
             this.form.push = res.data.push ? true : false
+            this.form.description = res.data.description
             switch (this.form.pricingMethod) {
               case 0:
                 this.tableData1 = res.data.segPriceList || []
                 break;
               case 1:
                 this.tableData2 = res.data.usedPriceList || []
+                this.form.dim = res.data.dim
                 break;
               default:
                 this.form.singlePrice = res.data.singlePrice || 0