diff --git a/ant-design-vue/src/mixins/JeecgListMixin.js b/ant-design-vue/src/mixins/JeecgListMixin.js
index 1ad33c0..fdad3c8 100644
--- a/ant-design-vue/src/mixins/JeecgListMixin.js
+++ b/ant-design-vue/src/mixins/JeecgListMixin.js
@@ -236,7 +236,7 @@ export const JeecgListMixin = {
handleTableChange(pagination, filters, sorter) {
//分页、排序、筛选变化时触发
//TODO 筛选
- console.log(pagination)
+ console.log(pagination, filters, sorter)
if (Object.keys(sorter).length > 0) {
this.isorter.column = sorter.field;
this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
diff --git a/ant-design-vue/src/views/ttpouringequip/TtPouringEquipList.vue b/ant-design-vue/src/views/ttpouringequip/TtPouringEquipList.vue
index 2e77189..7818afc 100644
--- a/ant-design-vue/src/views/ttpouringequip/TtPouringEquipList.vue
+++ b/ant-design-vue/src/views/ttpouringequip/TtPouringEquipList.vue
@@ -130,38 +130,38 @@
},
data () {
return {
- description: 'tt_pouring_equip管理页面',
+ description: '浇注设备历史数据',
// 表头
columns: [
{
- title: '#',
- dataIndex: '',
+ title: 'ID',
+ dataIndex: 'id',
key:'rowIndex',
width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
+ align:"center"
},
{
title:'设备编号',
align:"center",
- dataIndex: 'eqtNo'
+ dataIndex: 'eqtNo',
+ customRender:function (text) {
+ return "浇注机" + text;
+ }
},
{
- title:'设备供应商',
+ title:'设备名称',
align:"center",
- dataIndex: 'eqtSupplier'
+ dataIndex: 'descr'
},
{
- title:'料罐温度(℃)',
+ title:'设备IP',
align:"center",
- dataIndex: 'bucketTemperature'
+ dataIndex: 'eqtIp',
},
{
- title:'模具温度(℃)',
+ title:'温度(℃)',
align:"center",
- dataIndex: 'moldTemperature'
+ dataIndex: 'temperature'
},
{
title:'采集时间',
@@ -188,6 +188,11 @@
importExcelUrl: "ttpouringequip/ttPouringEquip/importExcel",
},
+ // 排序
+ isorter: {
+ column: "createTime",
+ order: "desc"
+ },
dictOptions:{},
superFieldList:[],
}
@@ -205,9 +210,8 @@
},
getSuperFieldList(){
let fieldList=[];
- fieldList.push({type:'BigDecimal',value:'bucketTemperature',text:'料罐温度',dictCode:''})
- fieldList.push({type:'BigDecimal',value:'moldTemperature',text:'模具温度',dictCode:''})
fieldList.push({type:'string',value:'eqtNo',text:'浇筑设备编号',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
fieldList.push({type:'date',value:'createTime',text:'记录的创建时间'})
this.superFieldList = fieldList
}
diff --git a/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipForm.vue b/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipForm.vue
index 5d8f16a..29c5878 100644
--- a/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipForm.vue
+++ b/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipForm.vue
@@ -9,13 +9,8 @@
-
-
-
-
-
-
-
+
+
@@ -55,12 +50,9 @@
},
confirmLoading: false,
validatorRules: {
- bucketTemperature: [
+ temperature: [
{ required: true, message: '请输入料罐温度!'},
],
- moldTemperature: [
- { required: true, message: '请输入模具温度!'},
- ],
// eqtNo: [
// { required: true, message: '请输入浇筑设备编号!'},
// ],
diff --git a/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipModal.vue b/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipModal.vue
index 7aa112c..c0bbbfe 100644
--- a/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipModal.vue
+++ b/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipModal.vue
@@ -13,7 +13,6 @@