From beca65f4d01ca07c358102a35b949c2a4f277afe Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 24 五月 2023 10:36:27 +0800
Subject: [PATCH] 增加车间监控界面
---
src/views/dry/dataDefine/DryOrder.data.ts | 449 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 280 insertions(+), 169 deletions(-)
diff --git a/src/views/dry/dataDefine/DryOrder.data.ts b/src/views/dry/dataDefine/DryOrder.data.ts
index bb146e3..959d62c 100644
--- a/src/views/dry/dataDefine/DryOrder.data.ts
+++ b/src/views/dry/dataDefine/DryOrder.data.ts
@@ -3,177 +3,257 @@
import { rules } from '/@/utils/helper/validator'
//鍒楄〃鏁版嵁
export const columns: BasicColumn[] = [
- {
- title: '宸ュ崟鏃堕棿',
- align: 'center',
- sorter: true,
- dataIndex: 'orderTime',
- customRender: ({ text }) => {
- return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
- },
- },
- {
- title: '宸ュ崟鍙�',
- align: 'center',
- dataIndex: 'code',
- },
- {
- title: '鑽潗',
- align: 'center',
- dataIndex: 'herbId_dictText',
- },
- {
- title: '鍒濆鍚按鐜�',
- align: 'center',
- dataIndex: 'initial',
- },
- {
- title: '鐩爣鍚按鐜�',
- align: 'center',
- dataIndex: 'target',
- },
- {
- title: '鎶曟枡閲�',
- align: 'center',
- dataIndex: 'feed',
- },
- {
- title: '棰勮骞茬嚗鏃堕棿',
- align: 'center',
- dataIndex: 'et',
- },
- {
- title: '骞叉枡閲嶉噺',
- align: 'center',
- dataIndex: 'yield',
- },
- {
- title: '骞茬嚗鏃堕棿',
- align: 'center',
- dataIndex: 'drying',
- },
- {
- title: '棰勮鍓╀綑鏃堕棿',
- align: 'center',
- dataIndex: 'remain',
- },
- {
- title: '璁惧',
- align: 'center',
- dataIndex: 'equId_dictText',
- },
- {
- title: '杞﹂棿',
- align: 'center',
- dataIndex: 'shopId_dictText',
- },
- {
- title: '宸ュ崟鐘舵��',
- align: 'center',
- dataIndex: 'orderStatus',
- },
- {
- title: '鎿嶄綔浜�',
- align: 'center',
- dataIndex: 'operator_dictText',
- },
+ {
+ title: '宸ュ崟鏃堕棿',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'orderTime',
+ customRender: ({ text }) => {
+ return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
+ },
+ },
+ {
+ title: '宸ュ崟鍙�',
+ align: 'center',
+ dataIndex: 'code',
+ },
+ {
+ title: '鑽潗',
+ align: 'center',
+ dataIndex: 'herbId_dictText',
+ },
+ {
+ title: '鍒濆鍚按鐜�',
+ align: 'center',
+ dataIndex: 'initial',
+ },
+ {
+ title: '鐩爣鍚按鐜�',
+ align: 'center',
+ dataIndex: 'target',
+ },
+ {
+ title: '鎶曟枡閲�',
+ align: 'center',
+ dataIndex: 'feed',
+ },
+ {
+ title: '鍒濆閲嶉噺',
+ align: 'center',
+ dataIndex: 'originWeight',
+ },
+ {
+ title: '棰勮骞茬嚗鏃堕棿',
+ align: 'center',
+ dataIndex: 'et',
+ },
+ {
+ title: '骞叉枡閲嶉噺',
+ align: 'center',
+ dataIndex: 'yield',
+ },
+ {
+ title: '骞茬嚗鏃堕棿',
+ align: 'center',
+ dataIndex: 'dryTime',
+ },
+ {
+ title: '鐑娓╁害',
+ align: 'center',
+ dataIndex: 'windTemp',
+ },
+ {
+ title: '鐜娓╁害',
+ align: 'center',
+ dataIndex: 'envTemp',
+ },
+ {
+ title: '鐜婀垮害',
+ align: 'center',
+ dataIndex: 'envHum',
+ },
+ {
+ title: '鑽℃枡寤舵椂锛坢s锛�',
+ align: 'center',
+ dataIndex: 'delay',
+ },
+ {
+ title: '缈绘枡娆℃暟',
+ align: 'center',
+ dataIndex: 'turn',
+ },
+ {
+ title: '棰勮鍓╀綑鏃堕棿',
+ align: 'center',
+ dataIndex: 'remain',
+ },
+ {
+ title: '璁惧',
+ align: 'center',
+ dataIndex: 'equId_dictText',
+ },
+ {
+ title: '杞﹂棿',
+ align: 'center',
+ dataIndex: 'shopId_dictText',
+ },
+ {
+ title: '宸ュ崟鐘舵��',
+ align: 'center',
+ dataIndex: 'orderStatus',
+ },
+ {
+ title: '鎿嶄綔浜�',
+ align: 'center',
+ dataIndex: 'operator_dictText',
+ },
]
//鏌ヨ鏁版嵁
-export const searchFormSchema: FormSchema[] = []
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: '宸ュ崟鏃堕棿',
+ field: 'orderTime',
+ component: 'RangePicker',
+ componentProps: {
+ valueType: 'Date',
+ },
+ colProps: { span: 6 },
+ },
+ {
+ label: '鑽潗鍚嶇О',
+ field: 'herbName',
+ component: 'Input',
+ colProps: { span: 6 },
+ },
+]
//琛ㄥ崟鏁版嵁
export const formSchema: FormSchema[] = [
- {
- label: '宸ュ崟鏃堕棿',
- field: 'orderTime',
- component: 'DatePicker',
- },
- {
- label: '宸ュ崟鍙�',
- field: 'code',
- component: 'Input',
- dynamicRules: ({ model, schema }) => {
- return [{ required: false }, { ...rules.duplicateCheckRule('dry_order', 'code', model, schema)[0] }]
- },
- },
- {
- label: '鑽潗',
- field: 'herbId',
- component: 'JDictSelectTag',
- componentProps: {
- dictCode: 'dry_herb,name,id,tenant_id=' + getTenantId(),
- },
- },
- {
- label: '鍒濆鍚按鐜�',
- field: 'initial',
- component: 'InputNumber',
- },
- {
- label: '鐩爣鍚按鐜�',
- field: 'target',
- component: 'InputNumber',
- },
- {
- label: '鎶曟枡閲�',
- field: 'feed',
- component: 'InputNumber',
- },
- {
- label: '棰勮骞茬嚗鏃堕棿',
- field: 'et',
- component: 'InputNumber',
- },
- {
- label: '骞叉枡閲嶉噺',
- field: 'yield',
- component: 'InputNumber',
- },
- {
- label: '骞茬嚗鏃堕棿',
- field: 'drying',
- component: 'InputNumber',
- },
- {
- label: '棰勮鍓╀綑鏃堕棿',
- field: 'remain',
- component: 'InputNumber',
- },
- {
- label: '璁惧',
- field: 'equId',
- component: 'JDictSelectTag',
- componentProps: {
- dictCode: 'dry_equipment,name,id,tenant_id=' + getTenantId(),
- },
- },
- {
- label: '杞﹂棿',
- field: 'shopId',
- component: 'JDictSelectTag',
- componentProps: {
- dictCode: 'dry_shop,name,id,tenant_id=' + getTenantId(),
- },
- },
- {
- label: '宸ュ崟鐘舵��',
- field: 'orderStatus',
- component: 'InputNumber',
- },
- {
- label: '鎿嶄綔浜�',
- field: 'operator',
- component: 'JDictSelectTag',
- componentProps: {
- dictCode: 'sys_user,realname,id,tenant_id=' + getTenantId(),
- },
- },
- // TODO 涓婚敭闅愯棌瀛楁锛岀洰鍓嶅啓姝讳负ID
- {
- label: '',
- field: 'id',
- component: 'Input',
- show: false,
- },
+ {
+ label: '宸ュ崟鏃堕棿',
+ field: 'orderTime',
+ component: 'DatePicker',
+ componentProps: {
+ showTime: true,
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ },
+ },
+ {
+ label: '宸ュ崟鍙�',
+ field: 'code',
+ component: 'Input',
+ dynamicRules: ({ model, schema }) => {
+ return [{ required: false }, { ...rules.duplicateCheckRule('dry_order', 'code', model, schema)[0] }]
+ },
+ },
+ {
+ label: '鑽潗',
+ field: 'herbId',
+ component: 'JDictSelectTag',
+ componentProps: {
+ dictCode: 'dry_herb,name,id,tenant_id=' + getTenantId(),
+ },
+ },
+ {
+ label: '鍒濆鍚按鐜�',
+ field: 'initial',
+ component: 'InputNumber',
+ },
+ {
+ label: '鐩爣鍚按鐜�',
+ field: 'target',
+ component: 'InputNumber',
+ },
+ {
+ label: '鎶曟枡閲�',
+ field: 'feed',
+ component: 'InputNumber',
+ },
+ {
+ label: '鍘熷閲嶉噺',
+ field: 'originWeight',
+ component: 'InputNumber',
+ },
+ {
+ label: '棰勮骞茬嚗鏃堕棿',
+ field: 'et',
+ component: 'InputNumber',
+ },
+ {
+ label: '骞叉枡閲嶉噺',
+ field: 'yield',
+ component: 'InputNumber',
+ },
+ {
+ label: '骞茬嚗鏃堕棿',
+ field: 'dryTime',
+ component: 'InputNumber',
+ },
+ {
+ label: '鐑娓╁害',
+ field: 'windTemp',
+ component: 'InputNumber',
+ },
+ {
+ label: '鐜娓╁害',
+ field: 'envTemp',
+ component: 'InputNumber',
+ },
+ {
+ label: '鐜婀垮害',
+ field: 'envHum',
+ component: 'InputNumber',
+ },
+ {
+ label: '鑽℃枡寤舵椂锛坢s锛�',
+ field: 'delay',
+ component: 'InputNumber',
+ },
+ {
+ label: '缈绘枡娆℃暟',
+ field: 'turn',
+ component: 'InputNumber',
+ },
+ {
+ label: '棰勮鍓╀綑鏃堕棿',
+ field: 'remain',
+ component: 'InputNumber',
+ },
+ {
+ label: '璁惧',
+ field: 'equId',
+ component: 'JDictSelectTag',
+ componentProps: {
+ dictCode: 'dry_equipment,name,id,tenant_id=' + getTenantId(),
+ },
+ },
+ {
+ label: '杞﹂棿',
+ field: 'shopId',
+ component: 'JDictSelectTag',
+ componentProps: {
+ dictCode: 'dry_shop,name,id,tenant_id=' + getTenantId(),
+ },
+ },
+ {
+ label: '宸ュ崟鐘舵��',
+ field: 'orderStatus',
+ component: 'InputNumber',
+ },
+ {
+ label: '鎿嶄綔浜�',
+ field: 'operator',
+ component: 'JDictSelectTag',
+ componentProps: {
+ dictCode: 'sys_user,realname,id,tenant_id=' + getTenantId(),
+ },
+ },
+ // TODO 涓婚敭闅愯棌瀛楁锛岀洰鍓嶅啓姝讳负ID
+ {
+ label: '',
+ field: 'id',
+ component: 'Input',
+ show: false,
+ },
]
/**
@@ -181,6 +261,37 @@
* @param param
*/
export function getBpmFormSchema(_formData): FormSchema[] {
- // 榛樿鍜屽師濮嬭〃鍗曚繚鎸佷竴鑷� 濡傛灉娴佺▼涓厤缃簡鏉冮檺鏁版嵁锛岃繖閲岄渶瑕佸崟鐙鐞唂ormSchema
- return formSchema
+ // 榛樿鍜屽師濮嬭〃鍗曚繚鎸佷竴鑷� 濡傛灉娴佺▼涓厤缃簡鏉冮檺鏁版嵁锛岃繖閲岄渶瑕佸崟鐙鐞唂ormSchema
+ return formSchema
+}
+
+export interface dryOrder {
+ id: string
+ order_time: Date
+ code: string
+ herb_id: string
+ herb_name: string
+ initial: number
+ target: number
+ feed: number
+ origin_weight: number
+ et: number
+ yield: number
+ dry_time: number
+ wind_temp: number
+ env_temp: number
+ env_hum: number
+ delay: number
+ turn: number
+ remain: number
+ equ_id: string
+ shop_id: string
+ tenant_id: string
+ create_by: string
+ create_time: Date
+ update_by: string
+ update_time: Date
+ order_status: number
+ operator: string
+ temps: string
}
--
Gitblit v1.9.3