|
|
@@ -125,7 +125,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="form.pageNum" :limit.sync="form.pageSize"
|
|
|
+ <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="dialogForm.pageNum" :limit.sync="dialogForm.pageSize"
|
|
|
@pagination="getDialogList" />
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -335,7 +335,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
groupFormatter(row) {
|
|
|
- return this.selectDictLabel(this.sceneOptions, row.groupId)
|
|
|
+ return row.groupId === null ? '-' : this.selectDictLabel(this.sceneOptions, row.groupId)
|
|
|
},
|
|
|
|
|
|
chargingFormatter(row) {
|
|
|
@@ -347,7 +347,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
platformIdFormatter(row) {
|
|
|
- return this.selectDictLabel(this.platformIdOptions, row.platformId)
|
|
|
+ return row.platformId === null ? '-' : this.selectDictLabel(this.platformIdOptions, row.platformId)
|
|
|
},
|
|
|
|
|
|
flowFormatter(row) {
|
