From bd8e5225fc4a0e5068b40003321044493b7b4f77 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 16:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 213 +++++++++++++++++++++++++---------------------------
1 files changed, 102 insertions(+), 111 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 538f1e0..55271c2 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -26,7 +26,7 @@
</avue-crud>
</basic-container>
</el-main>
- <originalAdd ref="originalAdd" @refreshTable="refreshChange" :attribute="editAttribute"></originalAdd>
+ <infoForm ref="infoForm" @refreshTable="refreshChange" :formData="editAttribute"></infoForm>
<!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
<advanced-query
:ref="advancedQueryParam.ref"
@@ -39,31 +39,53 @@
<script>
import {
- getList,
- remove,
- add,
- update, getPage, getApplyRange
-} from "@/api/omd/OmdAttribute";
+ getList,add,edit,del,push,updateStatus
+} from "@/api/docking/info";
import {getDictionary} from "@/api/omd/enum";
-import {mapGetters} from "vuex";
+import infoForm from "./infoForm.vue";
export default {
name: "info",
+ components:{infoForm},
data() {
return {
+ //鎺ュ彛绫诲瀷涓嬫媺
+ interfaceTypeList: [{
+ label: 'webService', value: 'webService'
+ }, {
+ label: '绫昏矾寰�', value: 'classPath'
+ }, {
+ label: 'Http', value: 'http'
+ }],
+ //鍙傛暟绫诲瀷涓嬫媺
+ paramTypeList: [{
+ label: 'xml', value: 'xml'
+ }, {
+ label: 'Json', value: 'json'
+ }],
+ //杩斿洖鍊肩被鍨嬩笅鎷�
+ returnTypeList: [{
+ label: 'xml', value: 'xml'
+ }, {
+ label: 'Json', value: 'json'
+ }],
+ //鎺ㄩ�佺被鍨�
+ pushTypeList: [{value: '1', label: '鏁版嵁鎺ㄩ��'},
+ {value: '2', label: '鍒嗙被鎺ㄩ��'},
+ {value: '3', label: '缂栫爜鐢宠'},
+ {value: '4', label: '缂栫爜鏇存敼锛堢姸鎬併�佸洖鏀讹級'},
+ {value: '5', label: '鍒嗙被鏌ヨ'},
+ {value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
+ {value: '7', label: '鏁版嵁鏌ヨ'}],
page: {
pageSize: 10,
currentPage: 1,
total: 100
},
- selectRow: "",
+ selectRow: {},
data: [],
form: {},
- attribute: {
- nullable: true
- },
editAttribute: {},
- applyRangeData: [],
selectionList: [],
option: {
height: "auto",
@@ -87,26 +109,21 @@
columnBtn: false,
column: [{
label: '鎺ㄩ�佺被鍨�',
- field: 'pushTypeText',
+ prop: 'pushType',
sortable: true,
width: 150,
- type: 'select',
- dicData: this.pushType,
- props: {
- label: "value",
- value: "key"
- },
+ formatter:function (d){
+ return this.pushTypeList[d.pushType]
+ }
}, {
label: '绯荤粺鍚嶇О',
- prop: 'sysbasename',
+ prop: 'sysBaseName',
sortable: true,
- search: true,
width: 150
}, {
label: '绯荤粺缂栧彿',
- prop: 'sysbaseid',
+ prop: 'sysBaseId',
sortable: true,
- search: true,
width: 150
}, {
label: '鎺ュ彛鍑芥暟',
@@ -115,12 +132,12 @@
width: 150
}, {
label: '鍛藉悕绌洪棿',
- prop: 'namespace',
+ prop: 'nameSpace',
sortable: true,
width: 150
}, {
label: 'soapAction',
- prop: 'soapaction',
+ prop: 'soapAction',
sortable: true,
width: 150
}, {
@@ -135,35 +152,27 @@
width: 150
}, {
label: '璇锋眰鍦板潃',
- prop: 'requesturl',
+ prop: 'requestUrl',
sortable: true,
width: 150
}, {
label: '鍙傛暟绫诲瀷',
- prop: 'paramtype',
+ prop: 'paramType',
sortable: true,
- width: 150
+ width: 150,
+ formatter:function (d){
+ return this.paramTypeList[d.paramType]
+ }
}, {
label: '杩斿洖鍊肩被鍨�',
- prop: 'returntype',
+ prop: 'returnType',
sortable: true,
- width: 150
+ width: 150,
+ formatter:function (d){
+ return this.returnTypeList[d.returnType]
+ }
}]
},
- itemForm: {
- itemData: {},
- activeName: "referTab",
- enumInitFlag: false,
- referInitFlag: false,
- form: {}
- },
- pushType: [{key: '1', value: '鏁版嵁鎺ㄩ��'},
- {key: '2', value: '鍒嗙被鎺ㄩ��'},
- {key: '3', value: '缂栫爜鐢宠'},
- {key: '4', value: '缂栫爜鏇存敼锛堢姸鎬併�佸洖鏀讹級'},
- {key: '5', value: '鍒嗙被鏌ヨ'},
- {key: '6', value: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
- {key: '7', value: '鏁版嵁鏌ヨ'}],
// 楂樼骇鏌ヨ瀵硅瘽妗嗙浉鍏冲弬鏁�
advancedQueryParam: {
ref: 'advancedQuery',
@@ -199,14 +208,10 @@
selectionChange(list) {
this.selectionList = list;
if(this.selectionList.length <= 0){
- this.itemForm.itemData = null
this.selectRow = null
- this.attribute = null
}
if (this.selectionList.length > 0) {
- this.itemForm.itemData = this.selectionList[list.length-1];
this.selectRow = this.selectionList[list.length-1].$index;
- this.attribute = this.selectionList[list.length-1];
}
},
selectionClear() {
@@ -223,26 +228,24 @@
this.onLoad(this.page, this.query);
},
addSave() {
- this.$refs.originalAdd.showSubmitDialog = true;
- const newAttr = {};
- newAttr.nullable = true;
- this.$refs.originalAdd.attribute = newAttr;
+ this.$refs.infoForm.showSubmitDialog = true;
+ this.$refs.infoForm.formData = {
+ dataFlowType:'push',
+ pushType:'1',
+ sysIntParamVOs:[],
+ sysIntHeaderVOs:[]
+ };
},
updateSave(row,index) {
- this.selectRow = index;
- var json = JSON.stringify(row);
- this.editAttribute = JSON.parse(json);
- this.editAttribute.nullable = row.nullable == 'true' ? true : false;
- this.$refs.originalAdd.attribute = this.editAttribute;
- this.$refs.originalAdd.showSubmitDialog = true;
- this.checkUsingReferDict(row);
- this.$refs.originalAdd.activeName = this.itemForm.activeName;
- this.$refs.originalAdd.enumInitFlag = this.itemForm.enumInitFlag;
- this.$refs.originalAdd.referInitFlag = this.itemForm.referInitFlag;
- // this.refreshChange()
+ this.selectRow = row;
+ this.editAttribute = row;
+ this.editAttribute.sysIntParamVOs = row.sysIntParamVOs||[];
+ this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs||[];
+ this.$refs.infoForm.formData = this.editAttribute;
+ this.$refs.infoForm.showSubmitDialog = true;
},
deleteSave(row,index) {
- this.$confirm("鍒犻櫎鍏冩暟鎹皢鏃犳硶琚仮澶�, 鏄惁缁х画?", "鎻愮ず", {
+ this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
iconClass: 'el-icon-question',
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -255,9 +258,41 @@
});
});
},
+ ENABLE(row,index){
+ //鍚敤
+ this.updateStatus("enable");
+ },
+ DISABLE(row,index){
+ //鍋滅敤
+ this.updateStatus("disable");
+ },
+ updateStatus(able){
+ var that = this;
+ var paramTemp = {
+ update:able,
+ oid:this.selectRow.oid,
+ ts:this.selectRow.ts
+ };
+ this.$confirm("鏄惁瑕�"+(able == "enbale" ? "鍚敤" : (able == "disable" ? "鍋滅敤": "鍙戝竷")) +"杩欐潯鏁版嵁锛�", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ return updateStatus(paramTemp);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message:(able == "enbale" ? "鍚敤鎴愬姛" : (able == "disable" ? "鍋滅敤鎴愬姛": "鍙戝竷鎴愬姛"))
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
PUSH(){
if (this.selectionList.length != 1) {
- this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹�')
+ this.$message.error('璇烽�夋嫨鏁版嵁')
return false;
}
this.$confirm("鏄惁瑕�"+ (this.selectionList[0].pushType == "1" ? "鎺ㄩ�佹暟鎹�" : "鎺ㄩ�佸垎绫�"), {
@@ -279,62 +314,18 @@
},
onLoad(page, params = {}) {
this.loading = true;
- getPage(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
+ getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.data = res.data.data.records;
- this.itemData = this.data[0];
});
},
rowClick(row) {
- this.itemForm.itemData = row;
- this.selectRow = row.$index;
- this.attribute = row;
-
+ this.selectRow = row;
this.$refs.crud.toggleSelection();
this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
- //this.checkUsingReferDict(row);
- },
- checkUsingReferDict(row){
- if (row.referToId !== null && row.referToId !== ""){
- this.itemForm.activeName = 'referTab';
- this.itemForm.referInitFlag = true;
- this.itemForm.enumInitFlag = false;
- }else if (row.usingDict === 'true'){
- this.itemForm.activeName = 'enumTab';
- this.itemForm.referInitFlag = false;
- this.itemForm.enumInitFlag = true;
- getDictionary({code: row.dictCode}).then(res => {
- this.editAttribute.dictValue = res.data.data[0].label;
- this.itemForm.itemData.dictValue = this.editAttribute.dictValue;
- this.$refs.originalAdd.dictEnums = res.data.data;
- })
- }else {
- this.itemForm.activeName = 'referTab';
- this.itemForm.referInitFlag = true;
- this.itemForm.enumInitFlag = false;
- }
- },
- selectBtmType() {
- this.referType.display = true;
- this.referType.title = "璇烽�夋嫨" + this.referType.value;
- },
- applyRangeOpen() {
- if (!this.selectRow && this.selectRow != 0) {
- this.$message({
- type: "warning",
- message: "璇峰厛閫夋嫨灞炴��"
- });
- }
- var oid = this.data[this.selectRow].oid;
- getApplyRange(oid).then(res => {
- this.applyRangeData = res.data.data;
- this.$refs.applyRange.rangeData = this.applyRangeData;
- this.$refs.applyRange.showDialog = true;
-
- });
},
/** 楂樼骇鏌ヨ瀵硅瘽妗嗙粍浠�,缁勪欢杩斿洖鐨勫�兼槸condtionMap[field]褰㈠紡鐨勬煡璇㈡潯浠讹紝淇濈暀浜嗗拰涔嬪墠涓�鏍风殑鏂瑰紡 */
echoSeniorContionMap(conditionMaps){
--
Gitblit v1.9.3