diff --git a/src/views/modules/pms/carHistory/components/configs/tableProps.js b/src/views/modules/pms/carHistory/components/configs/tableProps.js
index 7844078..0fa8c04 100644
--- a/src/views/modules/pms/carHistory/components/configs/tableProps.js
+++ b/src/views/modules/pms/carHistory/components/configs/tableProps.js
@@ -1,3 +1,26 @@
+import { timeFilter } from '@/utils/filters'
+
export default [
-
-]
\ No newline at end of file
+ // { type: 'index', label: '序号' },
+ // { prop: "createTime", label: "添加时间", filter: timeFilter },
+ // { prop: "stateDictValue", label: "状态", filter: v => (v !== null && v !== undefined) ? ['没有数据', '正常', '判废', '过渡'][v] : '-' }, // subcomponent
+ // { prop: "stateDictValue", label: "温度", subcomponent: StateSelect },
+ { prop: "code", label: "位置" },
+ { prop: "temp1", label: "温度" },
+ { prop: "press1", label: "窑内压力" },
+ { prop: "press2", label: "车下压力" },
+ { prop: "createTime", label: "时间", filter: timeFilter },
+ // { prop: "endTime", label: "结束时间", filter: timeFilter },
+ // {
+ // prop: "operations",
+ // name: "操作",
+ // fixed: "right",
+ // width: 150,
+ // subcomponent: TableOperaionComponent,
+ // options: [
+ // { name: "temperature", label: "烧制温度", },
+ // { name: "to-car-payload", label: "装载详情", icon: 'document' },
+ // { name: "delete", label: "删除", icon: 'delete', emitFull: true, promptField: 'code' }
+ // ],
+ // },
+];
\ No newline at end of file
diff --git a/src/views/modules/pms/carHistory/components/temperatureDialog.vue b/src/views/modules/pms/carHistory/components/temperatureDialog.vue
index 681a34d..5ac5918 100644
--- a/src/views/modules/pms/carHistory/components/temperatureDialog.vue
+++ b/src/views/modules/pms/carHistory/components/temperatureDialog.vue
@@ -9,12 +9,24 @@
+
@@ -43,6 +55,7 @@ export default {
size: 100,
tableLoading: false,
refreshLayoutKey: 0,
+ totalPage: 0,
};
},
activated() {
@@ -59,7 +72,6 @@ export default {
},
getList() {
this.tableLoading = true;
-
this.$http
.post("/pms/kilnPosHistory/pageView", {
page: this.page,
@@ -68,11 +80,35 @@ export default {
})
.then(({ data: res }) => {
console.log("temp dialog res", res);
+ this.tableLoading = false;
if (res.code === 0) {
+ if ("list" in res.data) {
+ this.dataList = res.data.list;
+ } else if (Array.isArray(res.data)) {
+ this.dataList = res.data;
+ } // else ...
} else {
+ this.dataList.splice(0);
}
+ this.dataList = [
+ { id: 1, code: 1, press1: 1, press2: 1, createTime: "2023-4-21 01:00:00", temp1: 1000 },
+ { id: 2, code: 2, press1: 2, press2: 2, createTime: "2023-4-21 02:00:00", temp1: 2000 },
+ { id: 3, code: 3, press1: 3, press2: 3, createTime: "2023-4-21 03:00:00", temp1: 3000 },
+ { id: 4, code: 4, press1: 4, press2: 4, createTime: "2023-4-21 04:00:00", temp1: 4000 },
+ { id: 5, code: 5, press1: 5, press2: 5, createTime: "2023-4-21 05:00:00", temp1: 5000 },
+ { id: 6, code: 6, press1: 6, press2: 6, createTime: "2023-4-21 06:00:00", temp1: 6000 },
+ { id: 7, code: 7, press1: 7, press2: 7, createTime: "2023-4-21 07:00:00", temp1: 7000 },
+ { id: 8, code: 8, press1: 8, press2: 8, createTime: "2023-4-21 08:00:00", temp1: 8000 },
+ { id: 9, code: 9, press1: 9, press2: 9, createTime: "2023-4-21 09:00:00", temp1: 9000 },
+ { id: 10, code: 10, press1: 10, press2: 10, createTime: "2023-4-21 10:00:00", temp1: 10000 },
+ { id: 11, code: 11, press1: 11, press2: 11, createTime: "2023-4-21 11:00:00", temp1: 11000 },
+ { id: 12, code: 12, press1: 12, press2: 12, createTime: "2023-4-21 12:00:00", temp1: 12000 },
+ ];
});
},
+ drawChart() {
+ // 根据 dataList 绘制折线图
+ },
handleOperate() {},
handlePageChange(page) {
this.page = page;
@@ -100,12 +136,18 @@ export default {
.data-list,
.temp-chart {
- border: 1px solid #ccc;
+ /* border: 1px solid #ccc; */
width: 45%;
+ overflow-y: auto;
+ position: relative;
}
.temp-chart {
flex: 1;
- margin-left: 18px;
+ /* margin-left: 18px; */
+ padding-left: 10px;
+ margin-left: 10px;
+ border-left: 1px solid #ccc;
+ background-color: lightblue;
}