lab_gzf 部署微服务应用

app_AssetManagement/public/assets/json/view-config.json

@@ -179,6 +179,16 @@
         "viewtag": "36033e61af0b1c58739674b69f745704",
         "memo": "系统自动添加"
     },
+    "eammonitorpointpickupview": {
+        "title": "测点数据选择视图",
+        "caption": "测点",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "WorkOrder",
+        "viewname": "EAMMonitorPointPickupView",
+        "viewfilename": "eammonitor-point-pickup-view",
+        "viewtag": "3b351d19dc35d9e1f2bc5e4baf98e9b8",
+        "memo": "系统自动添加"
+    },
     "eamasseteditview": {
         "title": "资产信息编辑",
         "caption": "资产",
@@ -419,6 +429,16 @@
         "viewtag": "7d805e7ef99d4689b7b68c2c6247dceb",
         "memo": "系统自动添加"
     },
+    "eamplanlinegridview": {
+        "title": "计划步骤表格视图",
+        "caption": "计划步骤",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Plan",
+        "viewname": "EAMPlanLineGridView",
+        "viewfilename": "eamplan-line-grid-view",
+        "viewtag": "7ecd11c1c5ee3add05dd5915be17cdb7",
+        "memo": "系统自动添加"
+    },
     "eamsparepartsgrouppickupview": {
         "title": "备件包数据选择视图",
         "caption": "备件包",
@@ -429,6 +449,16 @@
         "viewtag": "81139a9fb0fce24a58db188651ba7155",
         "memo": "系统自动添加"
     },
+    "eamplanlineeditview": {
+        "title": "计划步骤编辑",
+        "caption": "计划步骤",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Plan",
+        "viewname": "EAMPlanLineEditView",
+        "viewfilename": "eamplan-line-edit-view",
+        "viewtag": "82e6b21fb5252ac02580ad072b168cef",
+        "memo": "系统自动添加"
+    },
     "eamworkorderchildwogridview": {
         "title": "子工单表格",
         "caption": "工单",
@@ -459,6 +489,16 @@
         "viewtag": "906130a9861c2b0cff3173c9e171c1d1",
         "memo": "系统自动添加"
     },
+    "eammonitorpointpickupgridview": {
+        "title": "测点选择表格视图",
+        "caption": "测点",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "WorkOrder",
+        "viewname": "EAMMonitorPointPickupGridView",
+        "viewfilename": "eammonitor-point-pickup-grid-view",
+        "viewtag": "91dd54198b1e7777908d564a86bc548d",
+        "memo": "系统自动添加"
+    },
     "eamapplyinfoview": {
         "title": "维护申请信息",
         "caption": "维护申请",
@@ -599,6 +639,16 @@
         "viewtag": "b24fce391aeca43222a1017b50ba40e2",
         "memo": ""
     },
+    "eamplanpickupgridview": {
+        "title": "维护计划选择表格视图",
+        "caption": "维护计划",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "Plan",
+        "viewname": "EAMPlanPickupGridView",
+        "viewfilename": "eamplan-pickup-grid-view",
+        "viewtag": "b3cc4865b65edc16f8ad37d87bda4bae",
+        "memo": "系统自动添加"
+    },
     "eamlocationstatemodellineeditview": {
         "title": "功能位置状态模型明细编辑视图",
         "caption": "功能位置状态模型明细",
@@ -879,6 +929,16 @@
         "viewtag": "ef9454c4b53cd737f1beca7bf2c5ea25",
         "memo": ""
     },
+    "eamplanpickupview": {
+        "title": "维护计划数据选择视图",
+        "caption": "维护计划",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "Plan",
+        "viewname": "EAMPlanPickupView",
+        "viewfilename": "eamplan-pickup-view",
+        "viewtag": "f38b93e7294aee1966d727940e0852f4",
+        "memo": "系统自动添加"
+    },
     "eamworkorderapplywogridview": {
         "title": "产生的工单",
         "caption": "工单",

app_AssetManagement/src/authservice/auth-service-register.ts

@@ -43,6 +43,7 @@ export class AuthServiceRegister {
         this.allAuthService.set('eamlocationtype', () => import('@/authservice/eamlocation-type/eamlocation-type-auth-service'));
         this.allAuthService.set('eamworkorder', () => import('@/authservice/eamwork-order/eamwork-order-auth-service'));
         this.allAuthService.set('eamlocation', () => import('@/authservice/eamlocation/eamlocation-auth-service'));
+        this.allAuthService.set('eammonitorpoint', () => import('@/authservice/eammonitor-point/eammonitor-point-auth-service'));
         this.allAuthService.set('eamassetstate', () => import('@/authservice/eamasset-state/eamasset-state-auth-service'));
         this.allAuthService.set('eamlocationstate', () => import('@/authservice/eamlocation-state/eamlocation-state-auth-service'));
         this.allAuthService.set('eamassettype', () => import('@/authservice/eamasset-type/eamasset-type-auth-service'));

app_AssetManagement/src/authservice/eammonitor-point/eammonitor-point-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * 测点权限服务对象基类
+ *
+ * @export
+ * @class EAMMonitorPointAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class EAMMonitorPointAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  EAMMonitorPointAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  EAMMonitorPointAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof EAMMonitorPointAuthServiceBase
+     */
+    public getOPPrivs(mainSateOPPrivs:any):any{
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
+    }
+
+}
\ No newline at end of file

app_AssetManagement/src/authservice/eammonitor-point/eammonitor-point-auth-service.ts

+import EAMMonitorPointAuthServiceBase from './eammonitor-point-auth-service-base';
+
+
+/**
+ * 测点权限服务对象
+ *
+ * @export
+ * @class EAMMonitorPointAuthService
+ * @extends {EAMMonitorPointAuthServiceBase}
+ */
+export default class EAMMonitorPointAuthService extends EAMMonitorPointAuthServiceBase {
+
+    /**
+     * Creates an instance of  EAMMonitorPointAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  EAMMonitorPointAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_AssetManagement/src/interface/entity/eammonitor-point.ts

+/**
+ * 测点
+ *
+ * @export
+ * @interface EAMMonitorPoint
+ */
+export interface EAMMonitorPoint {
+
+    /**
+     * 测点标识
+     *
+     * @returns {*}
+     * @memberof EAMMonitorPoint
+     */
+    eammonitorpointid?: any;
+
+    /**
+     * 测点名称
+     *
+     * @returns {*}
+     * @memberof EAMMonitorPoint
+     */
+    eammonitorpointname?: any;
+
+    /**
+     * 更新人
+     *
+     * @returns {*}
+     * @memberof EAMMonitorPoint
+     */
+    updateman?: any;
+
+    /**
+     * 更新时间
+     *
+     * @returns {*}
+     * @memberof EAMMonitorPoint
+     */
+    updatedate?: any;
+
+    /**
+     * 建立时间
+     *
+     * @returns {*}
+     * @memberof EAMMonitorPoint
+     */
+    createdate?: any;
+
+    /**
+     * 建立人
+     *
+     * @returns {*}
+     * @memberof EAMMonitorPoint
+     */
+    createman?: any;
+}
\ No newline at end of file

app_AssetManagement/src/interface/entity/eamplan-line.ts

@@ -77,4 +77,60 @@ export interface EAMPlanLine {
      * @memberof EAMPlanLine
      */
     assetid?: any;
+
+    /**
+     * 序号
+     *
+     * @returns {*}
+     * @memberof EAMPlanLine
+     */
+    sortnumber?: any;
+
+    /**
+     * 内容
+     *
+     * @returns {*}
+     * @memberof EAMPlanLine
+     */
+    content?: any;
+
+    /**
+     * 维护计划
+     *
+     * @returns {*}
+     * @memberof EAMPlanLine
+     */
+    eamplanname?: any;
+
+    /**
+     * 资产
+     *
+     * @returns {*}
+     * @memberof EAMPlanLine
+     */
+    assetname?: any;
+
+    /**
+     * 功能位置
+     *
+     * @returns {*}
+     * @memberof EAMPlanLine
+     */
+    eamlocationname?: any;
+
+    /**
+     * 测点标识
+     *
+     * @returns {*}
+     * @memberof EAMPlanLine
+     */
+    eammonitorpointid?: any;
+
+    /**
+     * 测点
+     *
+     * @returns {*}
+     * @memberof EAMPlanLine
+     */
+    eammonitorpointname?: any;
 }
\ No newline at end of file

app_AssetManagement/src/interface/entity/eamplan.ts

@@ -125,4 +125,12 @@ export interface EAMPlan {
      * @memberof EAMPlan
      */
     mdate?: any;
+
+    /**
+     * 内容
+     *
+     * @returns {*}
+     * @memberof EAMPlan
+     */
+    content?: any;
 }
\ No newline at end of file

app_AssetManagement/src/locale/lang/en-US.ts

@@ -2,6 +2,7 @@ import eamlocationstatemodel_en_US from '@locale/lanres/entities/eamlocation-sta
 import eamlocationtype_en_US from '@locale/lanres/entities/eamlocation-type/eamlocation-type_en_US';
 import eamworkorder_en_US from '@locale/lanres/entities/eamwork-order/eamwork-order_en_US';
 import eamlocation_en_US from '@locale/lanres/entities/eamlocation/eamlocation_en_US';
+import eammonitorpoint_en_US from '@locale/lanres/entities/eammonitor-point/eammonitor-point_en_US';
 import eamassetstate_en_US from '@locale/lanres/entities/eamasset-state/eamasset-state_en_US';
 import eamlocationstate_en_US from '@locale/lanres/entities/eamlocation-state/eamlocation-state_en_US';
 import eamassettype_en_US from '@locale/lanres/entities/eamasset-type/eamasset-type_en_US';
@@ -271,6 +272,7 @@ export default {
         eamlocationtype: eamlocationtype_en_US,
         eamworkorder: eamworkorder_en_US,
         eamlocation: eamlocation_en_US,
+        eammonitorpoint: eammonitorpoint_en_US,
         eamassetstate: eamassetstate_en_US,
         eamlocationstate: eamlocationstate_en_US,
         eamassettype: eamassettype_en_US,

app_AssetManagement/src/locale/lang/zh-CN.ts

@@ -2,6 +2,7 @@ import eamlocationstatemodel_zh_CN from '@locale/lanres/entities/eamlocation-sta
 import eamlocationtype_zh_CN from '@locale/lanres/entities/eamlocation-type/eamlocation-type_zh_CN';
 import eamworkorder_zh_CN from '@locale/lanres/entities/eamwork-order/eamwork-order_zh_CN';
 import eamlocation_zh_CN from '@locale/lanres/entities/eamlocation/eamlocation_zh_CN';
+import eammonitorpoint_zh_CN from '@locale/lanres/entities/eammonitor-point/eammonitor-point_zh_CN';
 import eamassetstate_zh_CN from '@locale/lanres/entities/eamasset-state/eamasset-state_zh_CN';
 import eamlocationstate_zh_CN from '@locale/lanres/entities/eamlocation-state/eamlocation-state_zh_CN';
 import eamassettype_zh_CN from '@locale/lanres/entities/eamasset-type/eamasset-type_zh_CN';
@@ -270,6 +271,7 @@ export default {
         eamlocationtype: eamlocationtype_zh_CN,
         eamworkorder: eamworkorder_zh_CN,
         eamlocation: eamlocation_zh_CN,
+        eammonitorpoint: eammonitorpoint_zh_CN,
         eamassetstate: eamassetstate_zh_CN,
         eamlocationstate: eamlocationstate_zh_CN,
         eamassettype: eamassettype_zh_CN,

app_AssetManagement/src/locale/lanres/entities/eammonitor-point/eammonitor-point_en_US.ts

+
+export default {
+  fields: {
+    eammonitorpointid: "测点标识",
+    eammonitorpointname: "测点名称",
+    updateman: "更新人",
+    updatedate: "更新时间",
+    createdate: "建立时间",
+    createman: "建立人",
+  },
+	views: {
+		pickupview: {
+			caption: "测点",
+      		title: "测点数据选择视图",
+		},
+		pickupgridview: {
+			caption: "测点",
+      		title: "测点选择表格视图",
+		},
+	},
+	main_grid: {
+		columns: {
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+};
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eammonitor-point/eammonitor-point_zh_CN.ts

+export default {
+  fields: {
+    eammonitorpointid: "测点标识",
+    eammonitorpointname: "测点名称",
+    updateman: "更新人",
+    updatedate: "更新时间",
+    createdate: "建立时间",
+    createman: "建立人",
+  },
+	views: {
+		pickupview: {
+			caption: "测点",
+      		title: "测点数据选择视图",
+		},
+		pickupgridview: {
+			caption: "测点",
+      		title: "测点选择表格视图",
+		},
+	},
+	main_grid: {
+		columns: {
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+};
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamplan-line/eamplan-line_en_US.ts

@@ -10,5 +10,126 @@ export default {
     eamplanid: "维护计划标识",
     eamlocationid: "功能位置标识",
     assetid: "资产标识",
+    sortnumber: "序号",
+    content: "内容",
+    eamplanname: "维护计划",
+    assetname: "资产",
+    eamlocationname: "功能位置",
+    eammonitorpointid: "测点标识",
+    eammonitorpointname: "测点",
+  },
+	views: {
+		gridview: {
+			caption: "计划步骤",
+      		title: "计划步骤表格视图",
+		},
+		editview: {
+			caption: "计划步骤",
+      		title: "计划步骤编辑",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "基本信息", 
+			grouppanel1: "资产信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "计划步骤标识", 
+			srfmajortext: "计划步骤名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			sortnumber: "序号", 
+			eamplanlinename: "计划步骤名称", 
+			eamplanname: "维护计划", 
+			content: "内容", 
+			assetname: "资产", 
+			eamlocationname: "功能位置", 
+			eammonitorpointname: "测点", 
+			eamlocationid: "功能位置标识", 
+			eammonitorpointid: "测点标识", 
+			eamplanid: "维护计划标识", 
+			eamplanlineid: "计划步骤标识", 
+			assetid: "资产标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			sortnumber: "序号",
+			eamplanlinename: "计划步骤名称",
+			eamplanname: "维护计划",
+			assetname: "资产",
+			eamlocationname: "功能位置",
+			content: "内容",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem5: {
+			caption: "New",
+			tip: "New",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem2: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem3: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem10: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem2: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
 	},
 };
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamplan-line/eamplan-line_zh_CN.ts

@@ -9,5 +9,126 @@ export default {
     eamplanid: "维护计划标识",
     eamlocationid: "功能位置标识",
     assetid: "资产标识",
+    sortnumber: "序号",
+    content: "内容",
+    eamplanname: "维护计划",
+    assetname: "资产",
+    eamlocationname: "功能位置",
+    eammonitorpointid: "测点标识",
+    eammonitorpointname: "测点",
+  },
+	views: {
+		gridview: {
+			caption: "计划步骤",
+      		title: "计划步骤表格视图",
+		},
+		editview: {
+			caption: "计划步骤",
+      		title: "计划步骤编辑",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "基本信息", 
+			grouppanel1: "资产信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "计划步骤标识", 
+			srfmajortext: "计划步骤名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			sortnumber: "序号", 
+			eamplanlinename: "计划步骤名称", 
+			eamplanname: "维护计划", 
+			content: "内容", 
+			assetname: "资产", 
+			eamlocationname: "功能位置", 
+			eammonitorpointname: "测点", 
+			eamlocationid: "功能位置标识", 
+			eammonitorpointid: "测点标识", 
+			eamplanid: "维护计划标识", 
+			eamplanlineid: "计划步骤标识", 
+			assetid: "资产标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			sortnumber: "序号",
+			eamplanlinename: "计划步骤名称",
+			eamplanname: "维护计划",
+			assetname: "资产",
+			eamlocationname: "功能位置",
+			content: "内容",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem5: {
+			caption: "新建",
+			tip: "新建",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem2: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem3: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem10: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem2: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
 	},
 };
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamplan/eamplan_en_US.ts

@@ -16,6 +16,7 @@ export default {
     eammonitorpointname: "测点",
     description: "描述",
     mdate: "制定日期",
+    content: "内容",
   },
 	views: {
 		infoview: {
@@ -30,6 +31,10 @@ export default {
 			caption: "维护计划",
       		title: "维护计划主信息",
 		},
+		pickupgridview: {
+			caption: "维护计划",
+      		title: "维护计划选择表格视图",
+		},
 		quickcreateview: {
 			caption: "维护计划",
       		title: "快速新建",
@@ -38,6 +43,10 @@ export default {
 			caption: "维护计划",
       		title: "维护计划信息",
 		},
+		pickupview: {
+			caption: "维护计划",
+      		title: "维护计划数据选择视图",
+		},
 	},
 	if_001_form: {
 		details: {

app_AssetManagement/src/locale/lanres/entities/eamplan/eamplan_zh_CN.ts

@@ -15,6 +15,7 @@ export default {
     eammonitorpointname: "测点",
     description: "描述",
     mdate: "制定日期",
+    content: "内容",
   },
 	views: {
 		infoview: {
@@ -29,6 +30,10 @@ export default {
 			caption: "维护计划",
       		title: "维护计划主信息",
 		},
+		pickupgridview: {
+			caption: "维护计划",
+      		title: "维护计划选择表格视图",
+		},
 		quickcreateview: {
 			caption: "维护计划",
       		title: "快速新建",
@@ -37,6 +42,10 @@ export default {
 			caption: "维护计划",
       		title: "维护计划信息",
 		},
+		pickupview: {
+			caption: "维护计划",
+      		title: "维护计划数据选择视图",
+		},
 	},
 	if_001_form: {
 		details: {

app_AssetManagement/src/mock/index.ts

@@ -11,6 +11,7 @@ import './entity/eamlocation-state-models/eamlocation-state-models';
 import './entity/eamlocation-types/eamlocation-types';
 import './entity/eamwork-orders/eamwork-orders';
 import './entity/eamlocations/eamlocations';
+import './entity/eammonitor-points/eammonitor-points';
 import './entity/eamasset-states/eamasset-states';
 import './entity/eamlocation-states/eamlocation-states';
 import './entity/eamasset-types/eamasset-types';

app_AssetManagement/src/mock/viewconfig/viewconfig.ts

@@ -151,6 +151,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMApplyTypePickupGridView",
             "viewtag": "36033e61af0b1c58739674b69f745704"
         },
+        "eammonitorpointpickupview": {
+            "title": "测点数据选择视图",
+            "caption": "测点",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "WorkOrder",
+            "viewname": "EAMMonitorPointPickupView",
+            "viewtag": "3b351d19dc35d9e1f2bc5e4baf98e9b8"
+        },
         "eamasseteditview": {
             "title": "资产信息编辑",
             "caption": "资产",
@@ -343,6 +351,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMAssetPartsGroupEditView",
             "viewtag": "7d805e7ef99d4689b7b68c2c6247dceb"
         },
+        "eamplanlinegridview": {
+            "title": "计划步骤表格视图",
+            "caption": "计划步骤",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Plan",
+            "viewname": "EAMPlanLineGridView",
+            "viewtag": "7ecd11c1c5ee3add05dd5915be17cdb7"
+        },
         "eamsparepartsgrouppickupview": {
             "title": "备件包数据选择视图",
             "caption": "备件包",
@@ -351,6 +367,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMSparePartsGroupPickupView",
             "viewtag": "81139a9fb0fce24a58db188651ba7155"
         },
+        "eamplanlineeditview": {
+            "title": "计划步骤编辑",
+            "caption": "计划步骤",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Plan",
+            "viewname": "EAMPlanLineEditView",
+            "viewtag": "82e6b21fb5252ac02580ad072b168cef"
+        },
         "eamworkorderchildwogridview": {
             "title": "子工单表格",
             "caption": "工单",
@@ -375,6 +399,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMAssetPickupView",
             "viewtag": "906130a9861c2b0cff3173c9e171c1d1"
         },
+        "eammonitorpointpickupgridview": {
+            "title": "测点选择表格视图",
+            "caption": "测点",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "WorkOrder",
+            "viewname": "EAMMonitorPointPickupGridView",
+            "viewtag": "91dd54198b1e7777908d564a86bc548d"
+        },
         "eamapplyinfoview": {
             "title": "维护申请信息",
             "caption": "维护申请",
@@ -487,6 +519,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMLocationChildGridView",
             "viewtag": "b24fce391aeca43222a1017b50ba40e2"
         },
+        "eamplanpickupgridview": {
+            "title": "维护计划选择表格视图",
+            "caption": "维护计划",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "Plan",
+            "viewname": "EAMPlanPickupGridView",
+            "viewtag": "b3cc4865b65edc16f8ad37d87bda4bae"
+        },
         "eamlocationstatemodellineeditview": {
             "title": "功能位置状态模型明细编辑视图",
             "caption": "功能位置状态模型明细",
@@ -711,6 +751,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMApplyQuickCreateView",
             "viewtag": "ef9454c4b53cd737f1beca7bf2c5ea25"
         },
+        "eamplanpickupview": {
+            "title": "维护计划数据选择视图",
+            "caption": "维护计划",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "Plan",
+            "viewname": "EAMPlanPickupView",
+            "viewtag": "f38b93e7294aee1966d727940e0852f4"
+        },
         "eamworkorderapplywogridview": {
             "title": "产生的工单",
             "caption": "工单",

app_AssetManagement/src/pages/base/app-index-view/page-register.ts

@@ -16,12 +16,15 @@ export const PageComponents = {
         Vue.component('eamplan-info-view', () => import('@pages/plan/eamplan-info-view/eamplan-info-view.vue'));
         Vue.component('eamlocation-state-pickup-grid-view', () => import('@pages/location/eamlocation-state-pickup-grid-view/eamlocation-state-pickup-grid-view.vue'));
         Vue.component('eamplan-grid-view', () => import('@pages/plan/eamplan-grid-view/eamplan-grid-view.vue'));
+        Vue.component('eamplan-pickup-grid-view', () => import('@pages/plan/eamplan-pickup-grid-view/eamplan-pickup-grid-view.vue'));
         Vue.component('eamservice-level-grid-view', () => import('@pages/work-order/eamservice-level-grid-view/eamservice-level-grid-view.vue'));
         Vue.component('eamasset-grid-view', () => import('@pages/asset/eamasset-grid-view/eamasset-grid-view.vue'));
         Vue.component('eamapply-info-view', () => import('@pages/apply/eamapply-info-view/eamapply-info-view.vue'));
         Vue.component('eamspare-parts-group-edit-view', () => import('@pages/asset/eamspare-parts-group-edit-view/eamspare-parts-group-edit-view.vue'));
         Vue.component('eamlocation-state-model-pickup-grid-view', () => import('@pages/location/eamlocation-state-model-pickup-grid-view/eamlocation-state-model-pickup-grid-view.vue'));
         Vue.component('eamspare-parts-proparts-pro-grid-view', () => import('@pages/asset/eamspare-parts-proparts-pro-grid-view/eamspare-parts-proparts-pro-grid-view.vue'));
+        Vue.component('eamplan-line-edit-view', () => import('@pages/plan/eamplan-line-edit-view/eamplan-line-edit-view.vue'));
+        Vue.component('eammonitor-point-pickup-view', () => import('@pages/work-order/eammonitor-point-pickup-view/eammonitor-point-pickup-view.vue'));
         Vue.component('eamwork-order-child-wogrid-view', () => import('@pages/work-order/eamwork-order-child-wogrid-view/eamwork-order-child-wogrid-view.vue'));
         Vue.component('eamapply-type-pickup-view', () => import('@pages/apply/eamapply-type-pickup-view/eamapply-type-pickup-view.vue'));
         Vue.component('eamlocation-pickup-view', () => import('@pages/location/eamlocation-pickup-view/eamlocation-pickup-view.vue'));
@@ -50,6 +53,7 @@ export const PageComponents = {
         Vue.component('eamspare-parts-group-info-view', () => import('@pages/asset/eamspare-parts-group-info-view/eamspare-parts-group-info-view.vue'));
         Vue.component('eamlocation-info-view', () => import('@pages/location/eamlocation-info-view/eamlocation-info-view.vue'));
         Vue.component('eamasset-parts-group-edit-view', () => import('@pages/asset/eamasset-parts-group-edit-view/eamasset-parts-group-edit-view.vue'));
+        Vue.component('eammonitor-point-pickup-grid-view', () => import('@pages/work-order/eammonitor-point-pickup-grid-view/eammonitor-point-pickup-grid-view.vue'));
         Vue.component('eamlocation-type-pickup-grid-view', () => import('@pages/location/eamlocation-type-pickup-grid-view/eamlocation-type-pickup-grid-view.vue'));
         Vue.component('eamasset-type-edit-view', () => import('@pages/asset/eamasset-type-edit-view/eamasset-type-edit-view.vue'));
         Vue.component('eamwork-order-summary-view', () => import('@pages/work-order/eamwork-order-summary-view/eamwork-order-summary-view.vue'));
@@ -74,6 +78,7 @@ export const PageComponents = {
         Vue.component('eamlocation-state-list-exp-view', () => import('@pages/location/eamlocation-state-list-exp-view/eamlocation-state-list-exp-view.vue'));
         Vue.component('eamproductpickup-grid-view', () => import('@pages/asset/eamproductpickup-grid-view/eamproductpickup-grid-view.vue'));
         Vue.component('eamlocation-state-model-line-grid-view', () => import('@pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.vue'));
+        Vue.component('eamplan-pickup-view', () => import('@pages/plan/eamplan-pickup-view/eamplan-pickup-view.vue'));
         Vue.component('eamlocation-type-edit-view', () => import('@pages/location/eamlocation-type-edit-view/eamlocation-type-edit-view.vue'));
         Vue.component('eamwotype-pickup-grid-view', () => import('@pages/work-order/eamwotype-pickup-grid-view/eamwotype-pickup-grid-view.vue'));
         Vue.component('eamspare-parts-group-info-main-view', () => import('@pages/asset/eamspare-parts-group-info-main-view/eamspare-parts-group-info-main-view.vue'));
@@ -82,6 +87,7 @@ export const PageComponents = {
         Vue.component('eamasset-pickup-view', () => import('@pages/asset/eamasset-pickup-view/eamasset-pickup-view.vue'));
         Vue.component('eamasset-quick-create-view', () => import('@pages/asset/eamasset-quick-create-view/eamasset-quick-create-view.vue'));
         Vue.component('eamapply-type-grid-view', () => import('@pages/apply/eamapply-type-grid-view/eamapply-type-grid-view.vue'));
+        Vue.component('eamplan-line-grid-view', () => import('@pages/plan/eamplan-line-grid-view/eamplan-line-grid-view.vue'));
         Vue.component('eamwork-order-quick-create-view', () => import('@pages/work-order/eamwork-order-quick-create-view/eamwork-order-quick-create-view.vue'));
         Vue.component('eamlocation-grid-view', () => import('@pages/location/eamlocation-grid-view/eamlocation-grid-view.vue'));
         Vue.component('eamasset-type-pickup-grid-view', () => import('@pages/asset/eamasset-type-pickup-grid-view/eamasset-type-pickup-grid-view.vue'));

app_AssetManagement/src/pages/base/app-index-view/router.ts

@@ -297,6 +297,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/plan/eamplan-grid-view/eamplan-grid-view.vue'),
                 },
+                {
+                    path: 'eamplans/:eamplan?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.eamplan.views.pickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-pickup-grid-view/eamplan-pickup-grid-view.vue'),
+                },
                 {
                     path: 'eamservicelevels/:eamservicelevel?/gridview/:gridview?',
                     meta: {
@@ -411,6 +425,49 @@ const router = new Router({
                     },
                     component: () => import('@pages/asset/eamspare-parts-proparts-pro-grid-view/eamspare-parts-proparts-pro-grid-view.vue'),
                 },
+                {
+                    path: 'eamplans/:eamplan?/eamplanlines/:eamplanline?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamplanline.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'eamplanlines', parameterName: 'eamplanline' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-line-edit-view/eamplan-line-edit-view.vue'),
+                },
+                {
+                    path: 'eamplanlines/:eamplanline?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamplanline.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamplanlines', parameterName: 'eamplanline' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-line-edit-view/eamplan-line-edit-view.vue'),
+                },
+                {
+                    path: 'eammonitorpoints/:eammonitorpoint?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.eammonitorpoint.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eammonitorpoints', parameterName: 'eammonitorpoint' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eammonitor-point-pickup-view/eammonitor-point-pickup-view.vue'),
+                },
                 {
                     path: 'eamplans/:eamplan?/eamworkorders/:eamworkorder?/childwogridview/:childwogridview?',
                     meta: {
@@ -968,6 +1025,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/asset/eamasset-parts-group-edit-view/eamasset-parts-group-edit-view.vue'),
                 },
+                {
+                    path: 'eammonitorpoints/:eammonitorpoint?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.eammonitorpoint.views.pickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eammonitorpoints', parameterName: 'eammonitorpoint' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eammonitor-point-pickup-grid-view/eammonitor-point-pickup-grid-view.vue'),
+                },
                 {
                     path: 'eamlocationtypes/:eamlocationtype?/pickupgridview/:pickupgridview?',
                     meta: {
@@ -1439,6 +1510,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.vue'),
                 },
+                {
+                    path: 'eamplans/:eamplan?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.eamplan.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-pickup-view/eamplan-pickup-view.vue'),
+                },
                 {
                     path: 'eamlocationtypes/:eamlocationtype?/editview/:editview?',
                     meta: {
@@ -1581,6 +1666,35 @@ const router = new Router({
                     },
                     component: () => import('@pages/apply/eamapply-type-grid-view/eamapply-type-grid-view.vue'),
                 },
+                {
+                    path: 'eamplans/:eamplan?/eamplanlines/:eamplanline?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.eamplanline.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'eamplanlines', parameterName: 'eamplanline' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-line-grid-view/eamplan-line-grid-view.vue'),
+                },
+                {
+                    path: 'eamplanlines/:eamplanline?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.eamplanline.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamplanlines', parameterName: 'eamplanline' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-line-grid-view/eamplan-line-grid-view.vue'),
+                },
                 {
                     path: 'eamplans/:eamplan?/eamworkorders/:eamworkorder?/quickcreateview/:quickcreateview?',
                     meta: {

app_AssetManagement/src/pages/plan/eamplan-line-edit-view/eamplan-line-edit-view-base.tsx

+import { Subject } from 'rxjs';
+import { EditViewBase } from '@/studio-core';
+import EAMPlanLineService from '@/service/eamplan-line/eamplan-line-service';
+import EAMPlanLineAuthService from '@/authservice/eamplan-line/eamplan-line-auth-service';
+import EditViewEngine from '@engine/view/edit-view-engine';
+import EAMPlanLineUIService from '@/uiservice/eamplan-line/eamplan-line-ui-service';
+
+/**
+ * 计划步骤编辑视图基类
+ *
+ * @export
+ * @class EAMPlanLineEditViewBase
+ * @extends {EditViewBase}
+ */
+export class EAMPlanLineEditViewBase extends EditViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanLineEditViewBase
+     */
+    protected appDeName: string = 'eamplanline';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanLineEditViewBase
+     */
+    protected appDeKey: string = 'eamplanlineid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanLineEditViewBase
+     */
+    protected appDeMajor: string = 'eamplanlinename';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMPlanLineService}
+     * @memberof EAMPlanLineEditViewBase
+     */
+    protected appEntityService: EAMPlanLineService = new EAMPlanLineService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type EAMPlanLineUIService
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public appUIService: EAMPlanLineUIService = new EAMPlanLineUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof EAMPlanLineEditViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMPlanLineEditViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.eamplanline.views.editview.caption',
+        srfTitle: 'entities.eamplanline.views.editview.title',
+        srfSubTitle: 'entities.eamplanline.views.editview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMPlanLineEditViewBase
+     */
+    protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
+        view_form: { name: 'form', type: 'FORM' },
+    };
+
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof EAMPlanLineEditView
+     */
+    public toolBarModels: any = {
+        tbitem2: { name: 'tbitem2', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'sx-tb-saveandclose', icon: '../sasrfex/images/default/icon_saveandclose.png', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } },
+
+        tbitem1: { name: 'tbitem1', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+
+    };
+
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '82e6b21fb5252ac02580ad072b168cef';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public engine: EditViewEngine = new EditViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'eamplanline',
+            majorPSDEField: 'eamplanlinename',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem2')) {
+            this.toolbar_tbitem2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem1')) {
+            this.toolbar_tbitem1_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"EAMPlanLine");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"EAMPlanLine");
+    }
+
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanLineEditViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
+
+}
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-line-edit-view/eamplan-line-edit-view.html

+<studio-view-style2 viewName="eamplanlineeditview" viewTitle="计划步骤编辑" class='deeditview eamplan-line-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-line-edit-view/eamplan-line-edit-view.vue

+<template src="./eamplan-line-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { EAMPlanLineEditViewBase } from './eamplan-line-edit-view-base';
+import view_form from '@widgets/eamplan-line/main-form/main-form.vue';
+
+/**
+ * 计划步骤编辑视图
+ *
+ * @export
+ * @class EAMPlanLineEditView
+ * @extends {EAMPlanLineEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class EAMPlanLineEditView extends EAMPlanLineEditViewBase { }
+</script>

app_AssetManagement/src/pages/plan/eamplan-line-grid-view/eamplan-line-grid-view.html

+<studio-view-style2 viewName="eamplanlinegridview" viewTitle="计划步骤表格视图" class='degridview eamplan-line-grid-view'>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="计划步骤名称" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-line-grid-view/eamplan-line-grid-view.vue

+<template src="./eamplan-line-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { EAMPlanLineGridViewBase } from './eamplan-line-grid-view-base';
+import view_grid from '@widgets/eamplan-line/main-grid/main-grid.vue';
+import view_searchform from '@widgets/eamplan-line/default-searchform/default-searchform.vue';
+
+/**
+ * 计划步骤表格视图视图
+ *
+ * @export
+ * @class EAMPlanLineGridView
+ * @extends {EAMPlanLineGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class EAMPlanLineGridView extends EAMPlanLineGridViewBase { }
+</script>

app_AssetManagement/src/pages/plan/eamplan-pickup-grid-view/eamplan-pickup-grid-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupGridViewBase } from '@/studio-core';
+import EAMPlanService from '@/service/eamplan/eamplan-service';
+import EAMPlanAuthService from '@/authservice/eamplan/eamplan-auth-service';
+import PickupGridViewEngine from '@engine/view/pickup-grid-view-engine';
+import EAMPlanUIService from '@/uiservice/eamplan/eamplan-ui-service';
+
+/**
+ * 维护计划选择表格视图视图基类
+ *
+ * @export
+ * @class EAMPlanPickupGridViewBase
+ * @extends {PickupGridViewBase}
+ */
+export class EAMPlanPickupGridViewBase extends PickupGridViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    protected appDeName: string = 'eamplan';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    protected appDeKey: string = 'eamplanid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    protected appDeMajor: string = 'eamplanname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMPlanService}
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    protected appEntityService: EAMPlanService = new EAMPlanService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type EAMPlanUIService
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public appUIService: EAMPlanUIService = new EAMPlanUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof EAMPlanPickupGridViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.eamplan.views.pickupgridview.caption',
+        srfTitle: 'entities.eamplan.views.pickupgridview.title',
+        srfSubTitle: 'entities.eamplan.views.pickupgridview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = 'b3cc4865b65edc16f8ad37d87bda4bae';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public engine: PickupGridViewEngine = new PickupGridViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            grid: this.$refs.grid,
+            searchform: this.$refs.searchform,
+            keyPSDEField: 'eamplan',
+            majorPSDEField: 'eamplanname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public searchform_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+    /**
+     * searchform 部件 search 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public searchform_search($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
+    }
+
+    /**
+     * searchform 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    public searchform_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
+    }
+
+
+
+    /**
+     * 是否展开搜索表单
+     *
+     * @protected
+     * @type {boolean}
+     * @memberof EAMPlanPickupGridViewBase
+     */
+    protected isExpandSearchForm: boolean = true;
+
+
+}
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-pickup-grid-view/eamplan-pickup-grid-view.html

+<studio-view-style2 viewName="eamplanpickupgridview" viewTitle="维护计划选择表格视图" class='depickupgridview eamplan-pickup-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :selectedData="selectedData"
+        :showBusyIndicator="true"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-pickup-grid-view/eamplan-pickup-grid-view.vue

+<template src="./eamplan-pickup-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { EAMPlanPickupGridViewBase } from './eamplan-pickup-grid-view-base';
+import view_grid from '@widgets/eamplan/main-grid/main-grid.vue';
+import view_searchform from '@widgets/eamplan/default-searchform/default-searchform.vue';
+
+/**
+ * 维护计划选择表格视图视图
+ *
+ * @export
+ * @class EAMPlanPickupGridView
+ * @extends {EAMPlanPickupGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class EAMPlanPickupGridView extends EAMPlanPickupGridViewBase { }
+</script>

app_AssetManagement/src/pages/plan/eamplan-pickup-view/eamplan-pickup-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupViewBase } from '@/studio-core';
+import EAMPlanService from '@/service/eamplan/eamplan-service';
+import EAMPlanAuthService from '@/authservice/eamplan/eamplan-auth-service';
+import PickupViewEngine from '@engine/view/pickup-view-engine';
+import EAMPlanUIService from '@/uiservice/eamplan/eamplan-ui-service';
+
+/**
+ * 维护计划数据选择视图视图基类
+ *
+ * @export
+ * @class EAMPlanPickupViewBase
+ * @extends {PickupViewBase}
+ */
+export class EAMPlanPickupViewBase extends PickupViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanPickupViewBase
+     */
+    protected appDeName: string = 'eamplan';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanPickupViewBase
+     */
+    protected appDeKey: string = 'eamplanid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanPickupViewBase
+     */
+    protected appDeMajor: string = 'eamplanname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMPlanService}
+     * @memberof EAMPlanPickupViewBase
+     */
+    protected appEntityService: EAMPlanService = new EAMPlanService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type EAMPlanUIService
+     * @memberof EAMPlanPickupViewBase
+     */
+    public appUIService: EAMPlanUIService = new EAMPlanUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof EAMPlanPickupViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMPlanPickupViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.eamplan.views.pickupview.caption',
+        srfTitle: 'entities.eamplan.views.pickupview.title',
+        srfSubTitle: 'entities.eamplan.views.pickupview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMPlanPickupViewBase
+     */
+    protected containerModel: any = {
+        view_pickupviewpanel: { name: 'pickupviewpanel', type: 'PICKUPVIEWPANEL' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = 'f38b93e7294aee1966d727940e0852f4';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof EAMPlanPickupViewBase
+     */
+    public engine: PickupViewEngine = new PickupViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof EAMPlanPickupViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            pickupviewpanel: this.$refs.pickupviewpanel,
+            keyPSDEField: 'eamplan',
+            majorPSDEField: 'eamplanname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * pickupviewpanel 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupViewBase
+     */
+    public pickupviewpanel_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 activated 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupViewBase
+     */
+    public pickupviewpanel_activated($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanPickupViewBase
+     */
+    public pickupviewpanel_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-pickup-view/eamplan-pickup-view.html

+<studio-view-style2 viewName="eamplanpickupview" viewTitle="维护计划数据选择视图" class='depickupview eamplan-pickup-view'>
+    <div class="content-container pickup-view">
+                <view_pickupviewpanel 
+                    :viewState="viewState"  
+                    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                    :context="JSON.parse(JSON.stringify(context))" 
+                    :isSingleSelect="isSingleSelect"
+                    :selectedData="selectedData"
+                    :isShowButton="isShowButton"
+                    name="pickupviewpanel"  
+                    ref='pickupviewpanel' 
+                    @selectionchange="pickupviewpanel_selectionchange($event)"  
+                    @activated="pickupviewpanel_activated($event)"  
+                    @load="pickupviewpanel_load($event)"  
+                    @closeview="closeView($event)">
+                </view_pickupviewpanel>
+        </div>
+        <template slot="footer">
+            <div v-if="isShowButton" :style="{ textAlign: 'right' }">
+                <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk.apply(_self, arguments)">{{this.containerModel.view_okbtn.text}}</i-button>
+                    &nbsp;&nbsp;
+                <i-button @click="onClickCancel.apply(_self, arguments)">{{this.containerModel.view_cancelbtn.text}}</i-button>
+            </div>
+        </template>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-pickup-view/eamplan-pickup-view.vue

+<template src="./eamplan-pickup-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { EAMPlanPickupViewBase } from './eamplan-pickup-view-base';
+import view_pickupviewpanel from '@widgets/eamplan/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
+
+/**
+ * 维护计划数据选择视图视图
+ *
+ * @export
+ * @class EAMPlanPickupView
+ * @extends {EAMPlanPickupViewBase}
+ */
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class EAMPlanPickupView extends EAMPlanPickupViewBase { }
+</script>

app_AssetManagement/src/pages/work-order/eammonitor-point-pickup-grid-view/eammonitor-point-pickup-grid-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupGridViewBase } from '@/studio-core';
+import EAMMonitorPointService from '@/service/eammonitor-point/eammonitor-point-service';
+import EAMMonitorPointAuthService from '@/authservice/eammonitor-point/eammonitor-point-auth-service';
+import PickupGridViewEngine from '@engine/view/pickup-grid-view-engine';
+import EAMMonitorPointUIService from '@/uiservice/eammonitor-point/eammonitor-point-ui-service';
+
+/**
+ * 测点选择表格视图视图基类
+ *
+ * @export
+ * @class EAMMonitorPointPickupGridViewBase
+ * @extends {PickupGridViewBase}
+ */
+export class EAMMonitorPointPickupGridViewBase extends PickupGridViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    protected appDeName: string = 'eammonitorpoint';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    protected appDeKey: string = 'eammonitorpointid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    protected appDeMajor: string = 'eammonitorpointname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMMonitorPointService}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    protected appEntityService: EAMMonitorPointService = new EAMMonitorPointService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type EAMMonitorPointUIService
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public appUIService: EAMMonitorPointUIService = new EAMMonitorPointUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.eammonitorpoint.views.pickupgridview.caption',
+        srfTitle: 'entities.eammonitorpoint.views.pickupgridview.title',
+        srfSubTitle: 'entities.eammonitorpoint.views.pickupgridview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '91dd54198b1e7777908d564a86bc548d';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public engine: PickupGridViewEngine = new PickupGridViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            grid: this.$refs.grid,
+            searchform: this.$refs.searchform,
+            keyPSDEField: 'eammonitorpoint',
+            majorPSDEField: 'eammonitorpointname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public searchform_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+    /**
+     * searchform 部件 search 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public searchform_search($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
+    }
+
+    /**
+     * searchform 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    public searchform_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
+    }
+
+
+
+    /**
+     * 是否展开搜索表单
+     *
+     * @protected
+     * @type {boolean}
+     * @memberof EAMMonitorPointPickupGridViewBase
+     */
+    protected isExpandSearchForm: boolean = true;
+
+
+}
\ No newline at end of file

app_AssetManagement/src/pages/work-order/eammonitor-point-pickup-grid-view/eammonitor-point-pickup-grid-view.html

+<studio-view-style2 viewName="eammonitorpointpickupgridview" viewTitle="测点选择表格视图" class='depickupgridview eammonitor-point-pickup-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :selectedData="selectedData"
+        :showBusyIndicator="true"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/pages/work-order/eammonitor-point-pickup-grid-view/eammonitor-point-pickup-grid-view.vue

+<template src="./eammonitor-point-pickup-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { EAMMonitorPointPickupGridViewBase } from './eammonitor-point-pickup-grid-view-base';
+import view_grid from '@widgets/eammonitor-point/main-grid/main-grid.vue';
+import view_searchform from '@widgets/eammonitor-point/default-searchform/default-searchform.vue';
+
+/**
+ * 测点选择表格视图视图
+ *
+ * @export
+ * @class EAMMonitorPointPickupGridView
+ * @extends {EAMMonitorPointPickupGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class EAMMonitorPointPickupGridView extends EAMMonitorPointPickupGridViewBase { }
+</script>

app_AssetManagement/src/pages/work-order/eammonitor-point-pickup-view/eammonitor-point-pickup-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupViewBase } from '@/studio-core';
+import EAMMonitorPointService from '@/service/eammonitor-point/eammonitor-point-service';
+import EAMMonitorPointAuthService from '@/authservice/eammonitor-point/eammonitor-point-auth-service';
+import PickupViewEngine from '@engine/view/pickup-view-engine';
+import EAMMonitorPointUIService from '@/uiservice/eammonitor-point/eammonitor-point-ui-service';
+
+/**
+ * 测点数据选择视图视图基类
+ *
+ * @export
+ * @class EAMMonitorPointPickupViewBase
+ * @extends {PickupViewBase}
+ */
+export class EAMMonitorPointPickupViewBase extends PickupViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    protected appDeName: string = 'eammonitorpoint';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    protected appDeKey: string = 'eammonitorpointid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    protected appDeMajor: string = 'eammonitorpointname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMMonitorPointService}
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    protected appEntityService: EAMMonitorPointService = new EAMMonitorPointService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type EAMMonitorPointUIService
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    public appUIService: EAMMonitorPointUIService = new EAMMonitorPointUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof EAMMonitorPointPickupViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.eammonitorpoint.views.pickupview.caption',
+        srfTitle: 'entities.eammonitorpoint.views.pickupview.title',
+        srfSubTitle: 'entities.eammonitorpoint.views.pickupview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    protected containerModel: any = {
+        view_pickupviewpanel: { name: 'pickupviewpanel', type: 'PICKUPVIEWPANEL' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '3b351d19dc35d9e1f2bc5e4baf98e9b8';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    public engine: PickupViewEngine = new PickupViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            pickupviewpanel: this.$refs.pickupviewpanel,
+            keyPSDEField: 'eammonitorpoint',
+            majorPSDEField: 'eammonitorpointname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * pickupviewpanel 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    public pickupviewpanel_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 activated 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    public pickupviewpanel_activated($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMMonitorPointPickupViewBase
+     */
+    public pickupviewpanel_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_AssetManagement/src/pages/work-order/eammonitor-point-pickup-view/eammonitor-point-pickup-view.html

+<studio-view-style2 viewName="eammonitorpointpickupview" viewTitle="测点数据选择视图" class='depickupview eammonitor-point-pickup-view'>
+    <div class="content-container pickup-view">
+                <view_pickupviewpanel 
+                    :viewState="viewState"  
+                    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                    :context="JSON.parse(JSON.stringify(context))" 
+                    :isSingleSelect="isSingleSelect"
+                    :selectedData="selectedData"
+                    :isShowButton="isShowButton"
+                    name="pickupviewpanel"  
+                    ref='pickupviewpanel' 
+                    @selectionchange="pickupviewpanel_selectionchange($event)"  
+                    @activated="pickupviewpanel_activated($event)"  
+                    @load="pickupviewpanel_load($event)"  
+                    @closeview="closeView($event)">
+                </view_pickupviewpanel>
+        </div>
+        <template slot="footer">
+            <div v-if="isShowButton" :style="{ textAlign: 'right' }">
+                <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk.apply(_self, arguments)">{{this.containerModel.view_okbtn.text}}</i-button>
+                    &nbsp;&nbsp;
+                <i-button @click="onClickCancel.apply(_self, arguments)">{{this.containerModel.view_cancelbtn.text}}</i-button>
+            </div>
+        </template>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/pages/work-order/eammonitor-point-pickup-view/eammonitor-point-pickup-view.vue

+<template src="./eammonitor-point-pickup-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { EAMMonitorPointPickupViewBase } from './eammonitor-point-pickup-view-base';
+import view_pickupviewpanel from '@widgets/eammonitor-point/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
+
+/**
+ * 测点数据选择视图视图
+ *
+ * @export
+ * @class EAMMonitorPointPickupView
+ * @extends {EAMMonitorPointPickupViewBase}
+ */
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class EAMMonitorPointPickupView extends EAMMonitorPointPickupViewBase { }
+</script>

app_AssetManagement/src/service/eammonitor-point/eammonitor-point-service-base.ts

+import { Http,Util } from '@/utils';
+import EntityService from '../entity-service';
+
+
+
+/**
+ * 测点服务对象基类
+ *
+ * @export
+ * @class EAMMonitorPointServiceBase
+ * @extends {EntityServie}
+ */
+export default class EAMMonitorPointServiceBase extends EntityService {
+
+    /**
+     * Creates an instance of  EAMMonitorPointServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  EAMMonitorPointServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 初始化基础数据
+     *
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public initBasicData(){
+        this.APPLYDEKEY ='eammonitorpoint';
+        this.APPDEKEY = 'eammonitorpointid';
+        this.APPDENAME = 'eammonitorpoints';
+        this.APPDETEXT = 'eammonitorpointname';
+        this.APPNAME = 'assetmanagement';
+        this.SYSTEMNAME = 'ibizassetmanagement';
+    }
+
+// 实体接口
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().get(`/eammonitorpoints/${context.eammonitorpoint}/select`,isloading);
+            
+            return res;
+    }
+
+    /**
+     * Create接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+        if(!data.srffrontuf || data.srffrontuf !== "1"){
+            data[this.APPDEKEY] = null;
+        }
+        if(data.srffrontuf){
+            delete data.srffrontuf;
+        }
+        let tempContext:any = JSON.parse(JSON.stringify(context));
+        let res:any = await Http.getInstance().post(`/eammonitorpoints`,data,isloading);
+        
+        return res;
+    }
+
+    /**
+     * Update接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().put(`/eammonitorpoints/${context.eammonitorpoint}`,data,isloading);
+            
+            return res;
+    }
+
+    /**
+     * Remove接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().delete(`/eammonitorpoints/${context.eammonitorpoint}`,isloading);
+            return res;
+    }
+
+    /**
+     * Get接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = await Http.getInstance().get(`/eammonitorpoints/${context.eammonitorpoint}`,isloading);
+            
+            return res;
+    }
+
+    /**
+     * GetDraft接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/eammonitorpoints/getdraft`,isloading);
+        res.data.eammonitorpoint = data.eammonitorpoint;
+        
+        return res;
+    }
+
+    /**
+     * CheckKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/eammonitorpoints/${context.eammonitorpoint}/checkkey`,data,isloading);
+            return res;
+    }
+
+    /**
+     * Save接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().post(`/eammonitorpoints/${context.eammonitorpoint}/save`,data,isloading);
+            
+            return res;
+    }
+
+    /**
+     * FetchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EAMMonitorPointServiceBase
+     */
+    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        let res:any = Http.getInstance().get(`/eammonitorpoints/fetchdefault`,tempData,isloading);
+        return res;
+    }
+}
\ No newline at end of file

app_AssetManagement/src/service/eammonitor-point/eammonitor-point-service.ts

+import { Http,Util } from '@/utils';
+import EAMMonitorPointServiceBase from './eammonitor-point-service-base';
+
+
+/**
+ * 测点服务对象
+ *
+ * @export
+ * @class EAMMonitorPointService
+ * @extends {EAMMonitorPointServiceBase}
+ */
+export default class EAMMonitorPointService extends EAMMonitorPointServiceBase {
+
+    /**
+     * Creates an instance of  EAMMonitorPointService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  EAMMonitorPointService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_AssetManagement/src/service/eamplan-line/eamplan-line-service-base.ts

@@ -48,6 +48,11 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && context.eamplanline){
+            let res:any = Http.getInstance().get(`/eamplans/${context.eamplan}/eamplanlines/${context.eamplanline}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/eamplanlines/${context.eamplanline}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/eamplans/${context.eamplan}/eamplanlines`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && context.eamplanline){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/eamplans/${context.eamplan}/eamplanlines/${context.eamplanline}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/eamplanlines/${context.eamplanline}`,data,isloading);
@@ -104,6 +130,10 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && context.eamplanline){
+            let res:any = Http.getInstance().delete(`/eamplans/${context.eamplan}/eamplanlines/${context.eamplanline}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/eamplanlines/${context.eamplanline}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && context.eamplanline){
+            let res:any = await Http.getInstance().get(`/eamplans/${context.eamplan}/eamplanlines/${context.eamplanline}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/eamplanlines/${context.eamplanline}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && true){
+            let res:any = await Http.getInstance().get(`/eamplans/${context.eamplan}/eamplanlines/getdraft`,isloading);
+            res.data.eamplanline = data.eamplanline;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/eamplanlines/getdraft`,isloading);
         res.data.eamplanline = data.eamplanline;
         
@@ -149,6 +190,13 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && context.eamplanline){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/eamplans/${context.eamplan}/eamplanlines/${context.eamplanline}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/eamplanlines/${context.eamplanline}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && context.eamplanline){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/eamplans/${context.eamplan}/eamplanlines/${context.eamplanline}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/eamplanlines/${context.eamplanline}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class EAMPlanLineServiceBase extends EntityService {
      * @memberof EAMPlanLineServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.eamplan && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/eamplans/${context.eamplan}/eamplanlines/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/eamplanlines/fetchdefault`,tempData,isloading);
         return res;

app_AssetManagement/src/service/eamplan/eamplan-service-base.ts

@@ -73,6 +73,7 @@ export default class EAMPlanServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/eamplans`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_eamplanlines',JSON.stringify(res.data.eamplanlines?res.data.eamplanlines:[]));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_eamworkorders',JSON.stringify(res.data.eamworkorders?res.data.eamworkorders:[]));
         
         return res;

app_AssetManagement/src/service/entity-service-register.ts

@@ -43,6 +43,7 @@ export class EntityServiceRegister {
         this.allEntityService.set('eamlocationtype', () => import('@/service/eamlocation-type/eamlocation-type-service'));
         this.allEntityService.set('eamworkorder', () => import('@/service/eamwork-order/eamwork-order-service'));
         this.allEntityService.set('eamlocation', () => import('@/service/eamlocation/eamlocation-service'));
+        this.allEntityService.set('eammonitorpoint', () => import('@/service/eammonitor-point/eammonitor-point-service'));
         this.allEntityService.set('eamassetstate', () => import('@/service/eamasset-state/eamasset-state-service'));
         this.allEntityService.set('eamlocationstate', () => import('@/service/eamlocation-state/eamlocation-state-service'));
         this.allEntityService.set('eamassettype', () => import('@/service/eamasset-type/eamasset-type-service'));

app_AssetManagement/src/store/modules/view-action/state.ts

@@ -189,6 +189,16 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '3b351d19dc35d9e1f2bc5e4baf98e9b8',
+            viewmodule: 'WorkOrder',
+            viewname: 'EAMMonitorPointPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '91dd54198b1e7777908d564a86bc548d',
+            ],
+        },
         {
             viewtag: '3bac4846ece1082b8c3799d9a1fc7dde',
             viewmodule: 'Asset',
@@ -289,6 +299,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '7ecd11c1c5ee3add05dd5915be17cdb7',
                 'f51a84e7a2149cb66cb5db8370abb115',
                 '6e69be88d76554770ec8448800b6881d',
             ],
@@ -428,6 +439,16 @@ export const viewstate: any = {
                 '81139a9fb0fce24a58db188651ba7155',
             ],
         },
+        {
+            viewtag: '7ecd11c1c5ee3add05dd5915be17cdb7',
+            viewmodule: 'Plan',
+            viewname: 'EAMPlanLineGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '82e6b21fb5252ac02580ad072b168cef',
+            ],
+        },
         {
             viewtag: '81139a9fb0fce24a58db188651ba7155',
             viewmodule: 'Asset',
@@ -438,6 +459,19 @@ export const viewstate: any = {
                 'ebf6c093d1d6c599cc011b2c54ab6bc2',
             ],
         },
+        {
+            viewtag: '82e6b21fb5252ac02580ad072b168cef',
+            viewmodule: 'Plan',
+            viewname: 'EAMPlanLineEditView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '906130a9861c2b0cff3173c9e171c1d1',
+                '3b351d19dc35d9e1f2bc5e4baf98e9b8',
+                '2b28313d0f3925fa44b8683eb5ea54d6',
+                'f38b93e7294aee1966d727940e0852f4',
+            ],
+        },
         {
             viewtag: '8a03ef5ec2679c20c8072339004dcaaf',
             viewmodule: 'WorkOrder',
@@ -459,6 +493,15 @@ export const viewstate: any = {
                 'fc2bbe178f6e4ee12ebeb45875b7f87c',
             ],
         },
+        {
+            viewtag: '91dd54198b1e7777908d564a86bc548d',
+            viewmodule: 'WorkOrder',
+            viewname: 'EAMMonitorPointPickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '96e58ee9a57415beb8209aae53b14926',
             viewmodule: 'Apply',
@@ -600,6 +643,15 @@ export const viewstate: any = {
                 '1769804cd7ab51624ac3c88c2090363b',
             ],
         },
+        {
+            viewtag: 'b3cc4865b65edc16f8ad37d87bda4bae',
+            viewmodule: 'Plan',
+            viewname: 'EAMPlanPickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'b3d85711a6feb998249451ba167895d2',
             viewmodule: 'Location',
@@ -897,6 +949,16 @@ export const viewstate: any = {
                 '2b28313d0f3925fa44b8683eb5ea54d6',
             ],
         },
+        {
+            viewtag: 'f38b93e7294aee1966d727940e0852f4',
+            viewmodule: 'Plan',
+            viewname: 'EAMPlanPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'b3cc4865b65edc16f8ad37d87bda4bae',
+            ],
+        },
         {
             viewtag: 'f51a84e7a2149cb66cb5db8370abb115',
             viewmodule: 'WorkOrder',

app_AssetManagement/src/uiservice/eammonitor-point/eammonitor-point-ui-service-base.ts

+import { Environment } from '@/environments/environment';
+import { UIActionTool,Util } from '@/utils';
+import UIService from '../ui-service';
+import { Subject } from 'rxjs';
+import EAMMonitorPointService from '@/service/eammonitor-point/eammonitor-point-service';
+import EAMMonitorPointAuthService from '@/authservice/eammonitor-point/eammonitor-point-auth-service';
+
+/**
+ * 测点UI服务对象基类
+ *
+ * @export
+ * @class EAMMonitorPointUIServiceBase
+ */
+export default class EAMMonitorPointUIServiceBase extends UIService {
+
+    /**
+     * 是否支持工作流
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */
+    public isEnableWorkflow:boolean = false;
+
+    /**
+     * 当前UI服务对应的数据服务对象
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */
+    public dataService:EAMMonitorPointService = new EAMMonitorPointService();
+
+    /**
+     * 所有关联视图
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */ 
+    public allViewMap: Map<string, Object> = new Map();
+
+    /**
+     * 状态值
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */ 
+    public stateValue: number = 0;
+
+    /**
+     * 状态属性
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */ 
+    public stateField: string = "";
+
+    /**
+     * 主状态属性集合
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */  
+    public mainStateFields:Array<any> = [];
+
+    /**
+     * 主状态集合Map
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */  
+    public allDeMainStateMap:Map<string,string> = new Map();
+
+    /**
+     * 主状态操作标识Map
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */ 
+    public allDeMainStateOPPrivsMap:Map<string,any> = new Map();
+
+    /**
+     * Creates an instance of  EAMMonitorPointUIServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  EAMMonitorPointUIServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.authService = new EAMMonitorPointAuthService(opts);
+        this.initViewMap();
+        this.initDeMainStateMap();
+        this.initDeMainStateOPPrivsMap();
+    }
+
+    /**
+     * 初始化视图Map
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */  
+    public initViewMap(){
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'eammonitorpoints'});
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'eammonitorpoints'});
+    }
+
+    /**
+     * 初始化主状态集合
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */  
+    public initDeMainStateMap(){
+    }
+
+    /**
+     * 初始化主状态操作标识
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+     */  
+    public initDeMainStateOPPrivsMap(){
+    }
+
+
+    /**
+     * 获取指定数据的重定向页面
+     * 
+     * @param srfkey 数据主键
+     * @param isEnableWorkflow  重定向视图是否需要处理流程中的数据
+     * @memberof  EAMMonitorPointUIServiceBase
+     */
+    public async getRDAppView(srfkey:string,isEnableWorkflow:boolean){
+        this.isEnableWorkflow = isEnableWorkflow;
+        // 进行数据查询
+        let result:any = await this.dataService.Get({eammonitorpoint:srfkey});
+        const curData:any = result.data;
+        //判断当前数据模式,默认为true，todo
+        const iRealDEModel:boolean = true;
+
+        let bDataInWF:boolean = false;
+		let bWFMode:any = false;
+		// 计算数据模式
+		if (this.isEnableWorkflow) {
+			bDataInWF = await this.dataService.testDataInWF({stateValue:this.stateValue,stateField:this.stateField},curData);
+			if (bDataInWF) {
+				bDataInWF = true;
+				bWFMode = await this.dataService.testUserExistWorklist(null,curData);
+			}
+        }
+        let strPDTViewParam:string = await this.getDESDDEViewPDTParam(curData, bDataInWF, bWFMode);
+        //若不是当前数据模式，处理strPDTViewParam，todo
+
+        //查找视图
+
+        //返回视图
+        return this.allViewMap.get(strPDTViewParam);
+    }
+
+    /**
+	 * 获取实际的数据类型
+     * 
+     * @memberof  EAMMonitorPointUIServiceBase
+	 */
+	public getRealDEType(entity:any){
+
+    }
+
+    /**
+     * 获取实体单数据实体视图预定义参数
+     * 
+     * @param curData 当前数据
+     * @param bDataInWF 是否有数据在工作流中
+     * @param bWFMode   是否工作流模式
+     * @memberof  EAMMonitorPointUIServiceBase
+     */
+    public async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
+        let strPDTParam:string = '';
+		if (bDataInWF) {
+			// 判断数据是否在流程中
+        }
+        //多表单，todo
+        const isEnableMultiForm:boolean = false;
+        const multiFormDEField:string|null =null;
+
+        if (isEnableMultiForm && multiFormDEField) {
+			const objFormValue:string = curData[multiFormDEField];
+			if(!Environment.isAppMode){
+				return 'MOBEDITVIEW'+objFormValue;
+			}
+			return 'EDITVIEW'+objFormValue;
+        }
+		if(!Environment.isAppMode){
+            if(this.getDEMainStateTag(curData)){
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
+            }
+			return 'MOBEDITVIEW:';
+        }
+        if(this.getDEMainStateTag(curData)){
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
+        }
+		return 'EDITVIEW:';
+    }
+
+    /**
+     * 获取数据对象的主状态标识
+     * 
+     * @param curData 当前数据
+     * @memberof  EAMMonitorPointUIServiceBase
+     */  
+    public getDEMainStateTag(curData:any){
+        if(this.mainStateFields.length === 0) return null;
+
+        this.mainStateFields.forEach((singleMainField:any) =>{
+            if(!(singleMainField in curData)){
+                console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`);
+            }
+        })
+        for (let i = 0; i <= 1; i++) {
+            let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? curData[this.mainStateFields[0]] : "":"";
+            if (this.mainStateFields.length >= 2) {
+                for (let j = 0; j <= 1; j++) {
+                    let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? curData[this.mainStateFields[1]] : ""}`:strTag;
+                    if (this.mainStateFields.length >= 3) {
+                        for (let k = 0; k <= 1; k++) {
+                            let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? curData[this.mainStateFields[2]] : ""}`:strTag2;
+                            // 判断是否存在
+                            return this.allDeMainStateMap.get(strTag3);
+                        }
+                    }else{
+                        return this.allDeMainStateMap.get(strTag2);
+                    }
+                }
+            }else{
+                return this.allDeMainStateMap.get(strTag);
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取数据对象当前操作标识
+    * 
+    * @param data 当前数据
+    * @memberof  EAMMonitorPointUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(data:any){
+        if(this.getDEMainStateTag(data)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(data) as string));
+        }else{
+            return null;
+        }
+   }
+
+    /**
+    * 获取数据对象所有的操作标识
+    * 
+    * @param data 当前数据
+    * @memberof  EAMMonitorPointUIServiceBase
+    */ 
+   public getAllOPPrivs(data:any){
+       return this.authService.getOPPrivs(this.getDEMainStateOPPrivs(data));
+   }
+
+}
\ No newline at end of file

app_AssetManagement/src/uiservice/eammonitor-point/eammonitor-point-ui-service.ts

+import EAMMonitorPointUIServiceBase from './eammonitor-point-ui-service-base';
+
+/**
+ * 测点UI服务对象
+ *
+ * @export
+ * @class EAMMonitorPointUIService
+ */
+export default class EAMMonitorPointUIService extends EAMMonitorPointUIServiceBase {
+
+    /**
+     * Creates an instance of  EAMMonitorPointUIService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  EAMMonitorPointUIService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

app_AssetManagement/src/uiservice/eamplan-line/eamplan-line-ui-service-base.ts

@@ -89,6 +89,8 @@ export default class EAMPlanLineUIServiceBase extends UIService {
      * @memberof  EAMPlanLineUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamplanlines'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamplanlines'});
     }
 
     /**

app_AssetManagement/src/uiservice/eamplan/eamplan-ui-service-base.ts

@@ -92,8 +92,10 @@ export default class EAMPlanUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'infoview',srfappde:'eamplans'});
         this.allViewMap.set(':',{viewname:'summaryview',srfappde:'eamplans'});
         this.allViewMap.set(':',{viewname:'info_mainview',srfappde:'eamplans'});
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'eamplans'});
         this.allViewMap.set(':',{viewname:'quickcreateview',srfappde:'eamplans'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamplans'});
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'eamplans'});
     }
 
     /**

app_AssetManagement/src/uiservice/ui-service-register.ts

@@ -43,6 +43,7 @@ export class UIServiceRegister {
         this.allUIService.set('eamlocationtype', () => import('@/uiservice/eamlocation-type/eamlocation-type-ui-service'));
         this.allUIService.set('eamworkorder', () => import('@/uiservice/eamwork-order/eamwork-order-ui-service'));
         this.allUIService.set('eamlocation', () => import('@/uiservice/eamlocation/eamlocation-ui-service'));
+        this.allUIService.set('eammonitorpoint', () => import('@/uiservice/eammonitor-point/eammonitor-point-ui-service'));
         this.allUIService.set('eamassetstate', () => import('@/uiservice/eamasset-state/eamasset-state-ui-service'));
         this.allUIService.set('eamlocationstate', () => import('@/uiservice/eamlocation-state/eamlocation-state-ui-service'));
         this.allUIService.set('eamassettype', () => import('@/uiservice/eamasset-type/eamasset-type-ui-service'));

app_AssetManagement/src/widgets/eammonitor-point/default-searchform/default-searchform-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, SearchFormControlBase } from '@/studio-core';
+import EAMMonitorPointService from '@/service/eammonitor-point/eammonitor-point-service';
+import DefaultService from './default-searchform-service';
+import EAMMonitorPointUIService from '@/uiservice/eammonitor-point/eammonitor-point-ui-service';
+import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+
+
+/**
+ * searchform部件基类
+ *
+ * @export
+ * @class SearchFormControlBase
+ * @extends {DefaultSearchFormBase}
+ */
+export class DefaultSearchFormBase extends SearchFormControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof DefaultSearchFormBase
+     */
+    protected controlType: string = 'SEARCHFORM';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {DefaultService}
+     * @memberof DefaultSearchFormBase
+     */
+    public service: DefaultService = new DefaultService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMMonitorPointService}
+     * @memberof DefaultSearchFormBase
+     */
+    public appEntityService: EAMMonitorPointService = new EAMMonitorPointService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof DefaultSearchFormBase
+     */
+    protected appDeName: string = 'eammonitorpoint';
+
+    /**
+     * 应用实体中文名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof DefaultSearchFormBase
+     */
+    protected appDeLogicName: string = '测点';
+
+    /**
+     * 表单数据对象
+     *
+     * @type {*}
+     * @memberof DefaultSearchFormBase
+     */
+    public data: any = {
+    };
+
+    /**
+     * 详情模型集合
+     *
+     * @type {*}
+     * @memberof DefaultSearchFormBase
+     */
+    public detailsModel: any = {
+        formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
+, 
+    };
+}
\ No newline at end of file

app_AssetManagement/src/widgets/eammonitor-point/default-searchform/default-searchform-model.ts

+/**
+ * Default 部件模型
+ *
+ * @export
+ * @class DefaultModel
+ */
+export default class DefaultModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof DefaultModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_AssetManagement/src/widgets/eammonitor-point/default-searchform/default-searchform.html

+<i-form :model="this.data" class='app-search-form' ref='searchform' style="">
+  <input style="display:none;"/>
+  <div class="search-button">
+    <i-button size="small" type="primary" ghost @click="onSearch.apply(_self, arguments)">{{$t('app.searchButton.search')}}</i-button>
+    <i-button size="small" type="default" ghost @click="onReset.apply(_self, arguments)">{{this.$t('app.searchButton.reset')}}</i-button>
+  </div>
+  <div class="form-content">
+          </div>
+</i-form>
\ No newline at end of file

app_AssetManagement/src/widgets/eammonitor-point/default-searchform/default-searchform.vue

+<template src="./default-searchform.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { DefaultSearchFormBase } from './default-searchform-base';
+ 
+
+/**
+ * searchform部件
+ *
+ * @export
+ * @class DefaultSearchForm
+ * @extends {DefaultSearchFormBase}
+ */
+@Component({
+    components: {
+         
+    }
+})
+@VueLifeCycleProcessing()
+export default class DefaultSearchForm extends DefaultSearchFormBase { }
+</script>

app_AssetManagement/src/widgets/eammonitor-point/main-grid/main-grid-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, GridControlBase } from '@/studio-core';
+import EAMMonitorPointService from '@/service/eammonitor-point/eammonitor-point-service';
+import MainService from './main-grid-service';
+import EAMMonitorPointUIService from '@/uiservice/eammonitor-point/eammonitor-point-ui-service';
+import { FormItemModel } from '@/model/form-detail';
+
+
+/**
+ * grid部件基类
+ *
+ * @export
+ * @class GridControlBase
+ * @extends {MainGridBase}
+ */
+export class MainGridBase extends GridControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainGridBase
+     */
+    protected controlType: string = 'GRID';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {MainService}
+     * @memberof MainGridBase
+     */
+    public service: MainService = new MainService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMMonitorPointService}
+     * @memberof MainGridBase
+     */
+    public appEntityService: EAMMonitorPointService = new EAMMonitorPointService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainGridBase
+     */
+    protected appDeName: string = 'eammonitorpoint';
+
+    /**
+     * 应用实体中文名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainGridBase
+     */
+    protected appDeLogicName: string = '测点';
+
+    /**
+     * 界面UI服务对象
+     *
+     * @type {EAMMonitorPointUIService}
+     * @memberof MainBase
+     */  
+    public appUIService:EAMMonitorPointUIService = new EAMMonitorPointUIService(this.$store);
+
+    /**
+     * 界面行为模型
+     *
+     * @type {*}
+     * @memberof MainBase
+     */  
+    public ActionModel: any = {
+    };
+
+    /**
+     * 本地缓存标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainBase
+     */
+    protected localStorageTag: string = 'eammonitorpoint_main_grid';
+
+    /**
+     * 所有列成员
+     *
+     * @type {any[]}
+     * @memberof MainGridBase
+     */
+    public allColumns: any[] = [
+    ]
+
+    /**
+     * 获取表格行模型
+     *
+     * @type {*}
+     * @memberof MainGridBase
+     */
+    public getGridRowModel(){
+        return {
+          srfkey: new FormItemModel(),
+        }
+    }
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof MainGridBase
+     */
+    public rules: any = {
+        srfkey: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '测点标识 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '测点标识 值不能为空', trigger: 'blur' },
+        ],
+    }
+
+    /**
+     * 获取对应列class
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
+    public hasRowEdit: any = {
+    };
+
+    /**
+     * 获取对应列class
+     *
+     * @param {*} $args row 行数据，column 列数据，rowIndex 行索引，列索引
+     * @returns {void}
+     * @memberof MainBase
+     */
+    public getCellClassName(args: {row: any, column: any, rowIndex: number, columnIndex: number}): any {
+        return ( this.hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
+    }
+
+
+}
\ No newline at end of file

app_AssetManagement/src/widgets/eammonitor-point/main-grid/main-grid-model.ts

+/**
+ * Main 部件模型
+ *
+ * @export
+ * @class MainModel
+ */
+export default class MainModel {
+
+	/**
+	 * 是否是实体数据导出
+	 *
+	 * @returns {any[]}
+	 * @memberof MainGridMode
+	 */
+	public isDEExport: boolean = false;
+
+	/**
+	 * 获取数据项集合
+	 *
+	 * @returns {any[]}
+	 * @memberof MainGridMode
+	 */
+	public getDataItems(): any[] {
+    if(this.isDEExport){
+		  return [
+      ]
+    }else{
+		  return [
+        {
+          name: 'srfmajortext',
+          prop: 'eammonitorpointname',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfdataaccaction',
+          prop: 'eammonitorpointid',
+          dataType: 'GUID',
+        },
+        {
+          name: 'srfkey',
+          prop: 'eammonitorpointid',
+          dataType: 'GUID',
+          isEditable:true
+        },
+        {
+          name: 'eammonitorpoint',
+          prop: 'eammonitorpointid',
+        },
+
+        {
+          name:'size',
+          prop:'size'
+        },
+        {
+          name:'query',
+          prop:'query'
+        },
+        {
+          name:'filter',
+          prop:'filter'
+        },
+        {
+          name:'page',
+          prop:'page'
+        },
+        {
+          name:'sort',
+          prop:'sort'
+        },
+        {
+          name:'srfparentdata',
+          prop:'srfparentdata'
+        },
+        // 前端新增修改标识，新增为"0",修改为"1"或未设值
+        {
+          name: 'srffrontuf',
+          prop: 'srffrontuf',
+          dataType: 'TEXT',
+        },
+      ]
+    }
+  }
+
+}
\ No newline at end of file

app_AssetManagement/src/widgets/eammonitor-point/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.less

+.pickupviewpanel{
+  width: 100%;
+}
\ No newline at end of file