update table height

2022-09-01 09:30:44 +08:00 · 2022-09-01 09:30:44 +08:00 · cfa1cca44a
commit cfa1cca44a
parent 2df5897f3d
32 changed files with 34 additions and 34 deletions
--- a/TODO.md
+++ b/TODO.md
@ -3,4 +3,4 @@
 1. 按钮加权限
 2. 国际化
 3. 表格高度 
-4. 表格时间格式修改
+4. 表格时间格式修改 √
--- a/src/components/base-dialog/AttrForm/index.vue
+++ b/src/components/base-dialog/AttrForm/index.vue
@ -7,7 +7,7 @@
 				:is="require('../../base-table/index.vue').default"
 				:table-head-configs="filterTableConfigs()"
 				:data="dataList"
-				:max-height="500"
+				:max-height="calcMaxHeight(8)"
 				@operate-event="handleOperations"
 			/>
 			<el-pagination
--- a/src/views/modules/monitoring/equipment.vue
+++ b/src/views/modules/monitoring/equipment.vue
@ -328,9 +328,9 @@ export default {
 				})
 			}).then(({ data }) => {
 				if (data && data.code === 0) {
-					// this.dataList = data.data.list
-					this.dataList = new Array(20).fill('1')
-					console.log('data list', this.dataList)
+					this.dataList = data.data.list
+					// this.dataList = new Array(20).fill('1')
+					// console.log('data list', this.dataList)
 					this.totalPage = data.data.total
 				} else {
 					this.dataList = []
--- a/src/views/modules/monitoring/equipmentAlarmLog.vue
+++ b/src/views/modules/monitoring/equipmentAlarmLog.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentFile.vue
+++ b/src/views/modules/monitoring/equipmentFile.vue
@ -35,7 +35,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentGroup.vue
+++ b/src/views/modules/monitoring/equipmentGroup.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentGroupAlarm.vue
+++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue
@ -48,7 +48,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentPlc.vue
+++ b/src/views/modules/monitoring/equipmentPlc.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentPlcConnect.vue
+++ b/src/views/modules/monitoring/equipmentPlcConnect.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />

 		<el-pagination
 			@size-change="sizeChangeHandle"
--- a/src/views/modules/monitoring/equipmentPlcParam.vue
+++ b/src/views/modules/monitoring/equipmentPlcParam.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentQuantity.vue
+++ b/src/views/modules/monitoring/equipmentQuantity.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentStatusLog.vue
+++ b/src/views/modules/monitoring/equipmentStatusLog.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentType.vue
+++ b/src/views/modules/monitoring/equipmentType.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentTypeFile.vue
+++ b/src/views/modules/monitoring/equipmentTypeFile.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/equipmentattr.vue
+++ b/src/views/modules/monitoring/equipmentattr.vue
@ -31,7 +31,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/factory.vue
+++ b/src/views/modules/monitoring/factory.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/product.vue
+++ b/src/views/modules/monitoring/product.vue
@ -12,7 +12,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />

 		<el-pagination
 			@size-change="sizeChangeHandle"
--- a/src/views/modules/monitoring/productArrt.vue
+++ b/src/views/modules/monitoring/productArrt.vue
@ -35,7 +35,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/productionLine.vue
+++ b/src/views/modules/monitoring/productionLine.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/productionLineRecSch.vue
+++ b/src/views/modules/monitoring/productionLineRecSch.vue
@ -26,7 +26,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/qualityInspectionDet.vue
+++ b/src/views/modules/monitoring/qualityInspectionDet.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/qualityInspectionRecord.vue
+++ b/src/views/modules/monitoring/qualityInspectionRecord.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />

 		<el-pagination
 			@size-change="sizeChangeHandle"
--- a/src/views/modules/monitoring/qualityInspectionType.vue
+++ b/src/views/modules/monitoring/qualityInspectionType.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/reportCategory.vue
+++ b/src/views/modules/monitoring/reportCategory.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />

 		<el-pagination
 			@size-change="sizeChangeHandle"
--- a/src/views/modules/monitoring/reportDetail.vue
+++ b/src/views/modules/monitoring/reportDetail.vue
@ -11,7 +11,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />

 		<el-pagination
 			@size-change="sizeChangeHandle"
--- a/src/views/modules/monitoring/reportSheet.vue
+++ b/src/views/modules/monitoring/reportSheet.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/reportSheetCategory.vue
+++ b/src/views/modules/monitoring/reportSheetCategory.vue
@ -33,7 +33,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/sysfile.vue
+++ b/src/views/modules/monitoring/sysfile.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/sysfileType.vue
+++ b/src/views/modules/monitoring/sysfileType.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/workShopSection.vue
+++ b/src/views/modules/monitoring/workShopSection.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/workShopSectionEquipment.vue
+++ b/src/views/modules/monitoring/workShopSectionEquipment.vue
@ -10,7 +10,7 @@
 			</el-form-item>
 		</el-form>

-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
--- a/src/views/modules/monitoring/workshopSectionDialog.vue
+++ b/src/views/modules/monitoring/workshopSectionDialog.vue
@ -69,7 +69,7 @@
 					<base-table
 						:data="eqList"
 						:table-head-configs="tableProps"
-						:max-height="500"
+						:max-height="calcMaxHeight(8)"
 						@operate-event="handleOperations"
 						@refreshDataList="getDataList"
 					/>