Skip to content

资
资产管理
提交 8a1dd8f4 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_gzf 部署微服务应用

上级 d806eea7
隐藏空白字符变更
内嵌 并排
正在显示 包含 25 行增加 和 69 行删除
app_AssetManagement/src/components/app-span/app-span.tsx
浏览文件 @ 8a1dd8f4
......@@ -130,6 +130,14 @@ export default class AppSpan extends Vue {
*/
@Prop() public editorType?: string;
/**
* 单位
*
* @type {*}
* @memberof AppSpan
*/
@Prop() public unitName?: any;
/**
* vue 生命周期
*
......@@ -171,6 +179,14 @@ export default class AppSpan extends Vue {
} else if (Object.is(this.editorType, 'PICTURE') || Object.is(this.editorType, 'PICTURE_ONE') || Object.is(this.editorType, 'FILEUPLOADER')) {
return <app-upload-file-info value={this.value} name={this.name} />;
}
if(this.unitName != null && !Object.is(this.unitName, '')) {
let _text: any = this.text.toString();
if(_text.indexOf(this.unitName) == -1) {
return <span class="app-span">{this.text}&nbsp;{this.unitName}</span>;
}
}
return <span class="app-span">{this.text}</span>;
}
......
app_AssetManagement/src/uiservice/eamwork-order/eamwork-order-ui-service-base.ts
浏览文件 @ 8a1dd8f4
......@@ -156,7 +156,6 @@ export default class EAMWorkOrderUIServiceBase extends UIService {
const parameters: any[] = [
{ pathName: 'eamworkorders', parameterName: 'eamworkorder' },
];
actionContext.closeView(null);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
container.subscribe((result: any) => {
......@@ -164,12 +163,6 @@ export default class EAMWorkOrderUIServiceBase extends UIService {
return;
}
const _this: any = actionContext;
if (xData && xData.refresh && xData.refresh instanceof Function) {
xData.refresh(args);
}
if (this.EAMWorkOrder_OpenInfo_MainView && this.EAMWorkOrder_OpenInfo_MainView instanceof Function) {
this.EAMWorkOrder_OpenInfo_MainView(result.datas[0],context,params, $event, xData,actionContext);
}
return result.datas;
});
}
......@@ -183,59 +176,6 @@ export default class EAMWorkOrderUIServiceBase extends UIService {
openDrawer(view, data);
}
/**
* 打开主信息界面
*
* @param {any[]} args 当前数据
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @param {*} [srfParentDeName] 父实体名称
* @returns {Promise<any>}
*/
public async EAMWorkOrder_OpenInfo_MainView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
let data: any = {};
let parentContext:any = {};
let parentViewParam:any = {};
const _this: any = actionContext;
const _args: any[] = Util.deepCopy(args);
const actionTarget: string | null = 'SINGLEKEY';
Object.assign(context, { eamworkorder: '%eamworkorder%' });
Object.assign(params, { workorderid: '%eamworkorder%' });
Object.assign(params, { workordername: '%workordername%' });
if(_this.context){
parentContext = _this.context;
}
if(_this.viewparams){
parentViewParam = _this.viewparams;
}
context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
context = Object.assign({},actionContext.context,context);
let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
Object.assign(data,parentObj);
Object.assign(context,parentObj);
let deResParameters: any[] = [];
if(context.eamapply && true){
deResParameters = [
{ pathName: 'eamapplies', parameterName: 'eamapply' },
]
}
const parameters: any[] = [
{ pathName: 'eamworkorders', parameterName: 'eamworkorder' },
{ pathName: 'infoview', parameterName: 'infoview' },
];
const openIndexViewTab = (data: any) => {
const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
actionContext.$router.push(routePath);
return null;
}
openIndexViewTab(data);
}
/**
* 获取指定数据的重定向页面
......
assetmanagement-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 8a1dd8f4
......@@ -642,7 +642,7 @@
<!--输出实体[EAMWOTYPE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamwotype-15-28">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamwotype-17-28">
<createTable tableName="EAMWOTYPE">
<column name="EAMWOTYPENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -664,7 +664,7 @@
<!--输出实体[EAMWORKORDER]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamworkorder-75-29">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamworkorder-76-29">
<createTable tableName="WORKORDER">
<column name="WORKORDERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_EAMWORKORDER_WORKORDERID"/>
......@@ -843,26 +843,26 @@
<addForeignKeyConstraint baseColumnNames="EAMWOSTATEMODELID" baseTableName="EAMWOSTATEMODELLINE" constraintName="DER1N_EAMWOSTATEMODELLINE_EAMW" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOSTATEMODELID" referencedTableName="EAMWOSTATEMODEL" validate="true"/>
</changeSet>
<!--输出实体[EAMWOTYPE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamwotype-15-64">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamwotype-17-64">
<addForeignKeyConstraint baseColumnNames="EAMWOSTATEMODELID" baseTableName="EAMWOTYPE" constraintName="DER1N_EAMWOTYPE_EAMWOSTATEMODE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOSTATEMODELID" referencedTableName="EAMWOSTATEMODEL" validate="true"/>
</changeSet>
<!--输出实体[EAMWORKORDER]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-65">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-76-65">
<addForeignKeyConstraint baseColumnNames="ASSETID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMASSET_AS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-66">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-76-66">
<addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMLOCATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-67">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-76-67">
<addForeignKeyConstraint baseColumnNames="EAMSERVICELEVELID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMSERVICEL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMSERVICELEVELID" referencedTableName="EAMSERVICELEVEL" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-68">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-76-68">
<addForeignKeyConstraint baseColumnNames="EAMWOORIGINID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWOORIGIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOORIGINID" referencedTableName="EAMWOORIGIN" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-69">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-76-69">
<addForeignKeyConstraint baseColumnNames="PWORKORDERID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWORKORDE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WORKORDERID" referencedTableName="WORKORDER" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-70">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-76-70">
<addForeignKeyConstraint baseColumnNames="EAMWOTYPEID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWOTYPE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOTYPEID" referencedTableName="EAMWOTYPE" validate="true"/>
</changeSet>
<!--输出实体[EAMWOORIGIN]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或