diff --git a/src/views/modules/pms/carHistory/components/configs/chart.js b/src/views/modules/pms/carHistory/components/configs/chart.js index b1a2683..1125e95 100644 --- a/src/views/modules/pms/carHistory/components/configs/chart.js +++ b/src/views/modules/pms/carHistory/components/configs/chart.js @@ -6,26 +6,54 @@ export default (x_data, y_data) => ({ title: { text: "窑车温度", }, - grid: { - show: true, - top: 96, - left: 52, - right: 32, - bottom: 24, - }, - xAxis: { - type: "category", - data: Array(65) - .fill(1) - .map((val, index) => { - return val + index; - }), - axisLine: { - lineStyle: { - color: colors.line + grid: [ + { + id: 'temp-grid', + show: true, + top: 96, + left: 56, + right: 56, + bottom: 32, + }, + { + id: 'lambda-grid', + top: 0, + left: 0, + right: 0, + bottom: 0 + } + ], + xAxis: [ + { + gridIndex: 0, + id: 'temp-x-axis', + type: "category", + data: Array(65) + .fill(1) + .map((val, index) => { + return val + index; + }), + axisLine: { + lineStyle: { + color: colors.line + }, }, }, - }, + { + gridIndex: 1, + id: 'lambda-x-axis', + data: Array(65) + .fill(1) + .map((val, index) => { + return val + index; + }), + axisLine: { + lineStyle: { + color: colors.line + } + } + } + ], yAxis: { type: "value", name: "温度", diff --git a/src/views/modules/pms/carHistory/components/configs/tableProps.js b/src/views/modules/pms/carHistory/components/configs/tableProps.js index 311ee92..14941b4 100644 --- a/src/views/modules/pms/carHistory/components/configs/tableProps.js +++ b/src/views/modules/pms/carHistory/components/configs/tableProps.js @@ -8,7 +8,8 @@ export default [ { width: 60, prop: "code", label: "位置" }, { width: 60, prop: "temp1", label: "温度" }, { width: 80, prop: "press1", label: "窑内压力" }, - { width: 80, prop: "press2", label: "车下压力" }, + { width: 128, prop: "press2", label: "燃气消耗量(m3)" }, + { prop: "remark", label: "lambda" }, { prop: "createTime", label: "时间", filter: timeFilter }, // { prop: "endTime", label: "结束时间", filter: timeFilter }, // { diff --git a/src/views/modules/pms/carHistory/components/temperatureDialog.vue b/src/views/modules/pms/carHistory/components/temperatureDialog.vue index 5b19d7b..161756d 100644 --- a/src/views/modules/pms/carHistory/components/temperatureDialog.vue +++ b/src/views/modules/pms/carHistory/components/temperatureDialog.vue @@ -3,15 +3,14 @@ :visible="visible" title="烧制温度" class="temperature-dialog" - width="80%" + width="90%" @close="handleClose" :destroy-on-close="false" - :close-on-click-modal="false" - > + :close-on-click-modal="false">
-
-
+
+
+
@@ -93,14 +93,14 @@ export default { if (res.code === 0) { if ("list" in res.data) { this.dataList = res.data.list; - this.totalPage = res.data.total + this.totalPage = res.data.total; } else if (Array.isArray(res.data)) { this.dataList = res.data; - this.totalPage = res.data.length + this.totalPage = res.data.length; } // else ... } else { this.dataList.splice(0); - this.totalPage = 0 + this.totalPage = 0; } // this.dataList = [ // { id: 1, code: 1, press1: 1, press2: 1, createTime: "2023-4-21 01:00:00", temp1: 1000 }, @@ -122,7 +122,12 @@ export default { // 根据 dataList 绘制折线图 if (!this.chart) this.chart = echarts.init(document.getElementById("temp-chart")); // const y_data = Array(65).fill(0) - this.chart.setOption(loadChartConfig(null, this.dataList.map(i => i.temp1))); + this.chart.setOption( + loadChartConfig( + null, + this.dataList.map((i) => i.temp1) + ) + ); }, handleOperate() {}, handlePageChange(page) { @@ -152,7 +157,7 @@ export default { .data-list, .temp-chart { /* border: 1px solid #ccc; */ - width: 35%; + width: 45%; overflow-y: auto; position: relative; } @@ -161,7 +166,7 @@ export default { flex: 1; /* margin-left: 18px; */ padding-left: 10px; - margin-left: 10px; + /* border-left: 1px solid #ccc; */ /* background-color: lightblue; */ } diff --git a/src/views/modules/pms/carHistory/config.js b/src/views/modules/pms/carHistory/config.js index 9eef354..a59ca98 100644 --- a/src/views/modules/pms/carHistory/config.js +++ b/src/views/modules/pms/carHistory/config.js @@ -83,7 +83,7 @@ export default function () { const dialogJustFormConfigs = null; const carPayloadDialogConfigs = { - dialogWidth: "70%", + dialogWidth: "100%", carPayloadDialog: true, clickModalToClose: false, tableConfig: {