Merge remote-tracking branch 'origin/master'

src/views/ems/record/recordDnbInstant/index.vue

@@ -351,11 +351,11 @@ export default {
         { key: 1, label: `计量设备编号`, visible: true },
         { key: 2, label: `采集时间`, visible: true },
         { key: 3, label: `A项电压`, visible: true },
-        { key: 4, label: `B项电压`, visible: true },
+        { key: 4, label: `B项电压`, visible: false },
-        { key: 5, label: `C项电压`, visible: true },
+        { key: 5, label: `C项电压`, visible: false },
         { key: 6, label: `A项电流`, visible: true },
-        { key: 7, label: `B项电流`, visible: true },
+        { key: 7, label: `B项电流`, visible: false },
-        { key: 8, label: `C项电流`, visible: true },
+        { key: 8, label: `C项电流`, visible: false },
         { key: 9, label: `记录时间`, visible: false },
         { key: 10, label: `功率因数`, visible: true },
         { key: 11, label: `正向有功`, visible: true },

src/views/ems/report/energyPreview/index.vue

@@ -147,12 +147,12 @@
                   :label="'耗量(' + measurementUnit + ')'"
                   :prop="time.field"
                 />
-                <el-table-column
+<!--                <el-table-column-->
-                  min-width="120"
+<!--                  min-width="120"-->
-                  :key="time.powerField"
+<!--                  :key="time.powerField"-->
-                  :label="'发电量(' + measurementUnit + ')'"
+<!--                  :label="'发电量(' + measurementUnit + ')'"-->
-                  :prop="time.powerField"
+<!--                  :prop="time.powerField"-->
-                />
+<!--                />-->
               </el-table-column>
             </template>
           </el-table>
@@ -545,13 +545,14 @@ export default {
           title: '耗量合计(' + this.measurementUnit + ')',
           align: 'center',
           rowspan: 2
-        },
+        }
+/*         ,
         {
           field: 'powerExpendSum',
           title: '发电量合计(' + this.measurementUnit + ')',
           align: 'center',
           rowspan: 2
-        }
+        } */
       )
       for (let i in columns) {
         this.timeList.push({

src/views/ems/report/reportPointDnb/index.vue

@@ -327,7 +327,7 @@ export default {
         { key: 10, label: `更新人`, visible: false },
         { key: 11, label: `更新时间`, visible: false },
         { key: 12, label: `计量设备名称`, visible: true },
-        { key: 13, label: `发电量`, visible: true },
+        { key: 13, label: `发电量`, visible: false },
         { key: 14, label: `反向有功仪表值`, visible: false },
       ]
     }