From cde1133ee782df925462285811d2e31c426d95d1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 25 八月 2023 14:07:10 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/docking/info.vue | 115 ++++++++++++++++------------
Source/UBCS-WEB/src/views/docking/infoForm.vue | 2
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 110 ++++++++++++---------------
3 files changed, 115 insertions(+), 112 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index eea22b8..be3715f 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -4,26 +4,29 @@
3銆佺敤鎴疯緭鍏ョ殑鍊间細浠onditionMap[field]鐨勬牸寮忔嫾鎺ュソ杩涜鍥炰紶锛岀劧鍚庡氨闇�瑕佷娇鐢ㄧ殑鍦版柟鑷杩涜鏌ヨ鐨勮皟鐢紱
-->
<template>
- <el-dialog
+ <el-dialog
title="楂樼骇鏌ヨ"
append-to-body
- width="55vw"
- style="height: 115vh; margin-top: -10vh; overflow: hidden"
+ width="46vw"
+ style="height: 100vh;overflow: hidden"
+ v-dialogDrag
:visible.sync="isShowDialog"
lock-scroll
+ class="avue-dialog avue-dialog--top"
+ top="-3%"
:close-on-click-modal="false"
@close="recoverPage">
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
- <div slot="title" class="dialog-search-button">
- <el-button
- type="primary"
+ <div slot="title" class="dialog-search-button">
+ <el-button
+ type="primary"
size="small"
icon="el-icon-search"
@click="searchSubmit">
鏌ヨ
</el-button>
- <el-button
+ <el-button
type="warning"
size="small"
icon="el-icon-refresh"
@@ -33,11 +36,11 @@
</div>
<!-- 椤甸潰涓讳綋鍐呭鍖哄煙 -->
<div class="search-content">
- <el-row
+ <el-row
v-for="(item,index) in initOptions"
:key="item.queryField"
:span="24">
- <el-col :span="5">
+ <el-col :span="6">
<div class="grid-content">
<el-select disabled placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].queryField">
<el-option
@@ -67,9 +70,9 @@
<el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
<el-option
v-for="option in item.data"
- :key="option.itemValue"
- :label="option.itemName"
- :value="option.itemValue">
+ :key="option.itemValue || option.value"
+ :label="option.itemName || option.label"
+ :value="option.itemValue || option.value">
</el-option>
</el-select>
<el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
@@ -88,7 +91,7 @@
</vci-web-refer>
</div>
</el-col>
- <el-col :span="2">
+ <el-col :span="1">
<div class="grid-content">
<i class="el-icon-close" @click="removeInput(index)"></i>
</div>
@@ -174,7 +177,7 @@
label: "涓嶇瓑浜�",
},{
value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
- label: "澶т簬",
+ label: "澶т簬",
},{
value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
label: "灏忎簬",
@@ -205,7 +208,7 @@
let array = [];
this.initOptions.forEach((item,index) => {
if(item.fieldType==='combox') {
- let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
+ let enumCach = item.data || JSON.parse(localStorage.getItem(item.comboxKey));
if(enumCach != null) {
item.data = enumCach;
}else {
@@ -223,22 +226,22 @@
options: Object.assign(item.referConfig,{width:"80%"}),
})
//console.log(item.referConfigData.options);
- //console.log(item);
+ //console.log(item);
}
// TODO: 杩欏効淇敼涓�涓嬪弬鐓х殑鏌ヨ鏉′欢
let conditions = [];
if(item.fieldType==='text'){
conditions = this.searchConditions;
- }else if (item.fieldType==='combox'){
- conditions = this.dateConditions;
+ }else if (item.fieldType==='combox'|| item.fieldType==='truefalse'){
+ conditions = this.switchSearchConditions;
}else if (item.fieldType==='datetime') {
- conditions = this.switchSearchConditions;
+ conditions = this.dateConditions;
}else {
conditions = this.referSearchConditions;
}
// console.log(conditions);
this.$set(item,"conditions",conditions)
-
+
let add = {
queryField: String(item.queryField),
condition: item.fieldType==='text' ? String("_like"):String("_equal"),
@@ -254,13 +257,10 @@
/** 涓哄弬鐓х被鍨嬫椂鍊奸�夋嫨涔嬪悗鐨勫鐞� */
setReferValue(data,index){
- // console.log(index);
if(data.field) {
this.searchFormArrays[index][data.fieldValue] = data.value || '';
this.initOptions[index][data.showField] = data.text || '';
}
- // console.log(this.initOptions[index][data.showField]);
- // console.log(data);
},
// 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
@@ -288,7 +288,7 @@
// },
// 绉婚櫎鎼滅储妗�
-
+
removeInput(index){
//console.log(this.initOptions);
this.$delete(this.initOptions,index);
@@ -324,32 +324,18 @@
console.log(condtionParam);
this.$emit('echoContion',condtionParam)
this.isShowDialog = false;
- },
+ },
}
}
</script>
<style lang="scss" scoped>
-
.search-total {
- border-radius: 4px;
- min-height: 70vh;
- // margin-left: 35px;
- margin-top: -8px;
- overflow-y: auto;
- height: 70vh;
+ border-radius: 4px;
+ margin-top: -10px;
}
.dialog-search-button {
- border-top: 1px solid #E9E7E7;
- border-bottom: 1px solid #E9E7E7;
- padding: 10px 10px 10px;
- position: fixed;
- display: block;
- background-color: #fff;
- // top: 10%;
- margin-top: -30px;
- width: 50%;
- z-index: 1000;
+ margin-bottom: 15px;
}
// .search-total > .search-content > .el-row{
// margin-bottom: 5px;
@@ -358,39 +344,39 @@
// }
// }
.search-total > .search-content {
- margin-top: 40px;
}
.search-total > .search-content > .el-row > .el-col {
- border-radius: 4px;
+ border-radius: 4px;
}
.search-total > .search-content > .el-row > .el-col > .grid-content {
- border-radius: 4px;
- min-height: 36px;
+ border-radius: 4px;
+ min-height: 36px;
}
.search-total > .search-content > .el-row > .el-col {
- margin-right: 6px;
- &:last-child {
- margin-right: 0;
- }
+ margin-right: 6px;
+ &:last-child {
+ margin-right: 0;
+ }
}
.grid-content > .el-icon-close {
- font-size: 35px;
- cursor: pointer;
- color: rgb(222, 130, 105);
+ font-size: 30px;
+ line-height: 40px;
+ cursor: pointer;
+ color: rgb(222, 130, 105);
}
- .grid-content > .el-icon-close:hover{
- font-size: 38px;
- color: rgb(219, 52, 6);
+ .grid-content > .el-icon-close:hover {
+ font-size: 30px;
+ color: rgb(219, 52, 6);
}
.grid-content > .el-select {
- width: 100%;
+ width: 100%;
}
.grid-content > .el-switch {
- line-height: 40px;
- height: 40px;
+ line-height: 40px;
+ height: 40px;
}
- .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
- width: 100%;
+ .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner {
+ width: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index b75f0e7..0360a59 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -116,13 +116,13 @@
return this.pushTypeList[d.pushType]
}
}, {
- label: '绯荤粺鍚嶇О',
- prop: 'sysBaseName',
+ label: '绯荤粺缂栧彿',
+ prop: 'id',
sortable: true,
width: 150
}, {
- label: '绯荤粺缂栧彿',
- prop: 'sysBaseId',
+ label: '绯荤粺鍚嶇О',
+ prop: 'name',
sortable: true,
width: 150
}, {
@@ -171,6 +171,10 @@
formatter:function (d){
return this.returnTypeList[d.returnType]
}
+ }, {
+ label: '绯荤粺鎻忚堪',
+ prop: 'description',
+ width: 150
}]
},
// 楂樼骇鏌ヨ瀵硅瘽妗嗙浉鍏冲弬鏁�
@@ -266,18 +270,18 @@
},
ENABLE(row,index){
//鍚敤
- this.updateStatus("enable");
+ this.updateStatus(row,"enable");
},
DISABLE(row,index){
//鍋滅敤
- this.updateStatus("disable");
+ this.updateStatus(row,"disable");
},
- updateStatus(able){
+ updateStatus(selectRow,able){
var that = this;
var paramTemp = {
update:able,
- oid:this.selectRow.oid,
- ts:this.selectRow.ts
+ oid:selectRow.oid,
+ ts:selectRow.ts
};
this.$confirm("鏄惁瑕�"+(able == "enbale" ? "鍚敤" : (able == "disable" ? "鍋滅敤": "鍙戝竷")) +"杩欐潯鏁版嵁锛�", {
confirmButtonText: "纭畾",
@@ -293,12 +297,11 @@
type: "success",
message:(able == "enbale" ? "鍚敤鎴愬姛" : (able == "disable" ? "鍋滅敤鎴愬姛": "鍙戝竷鎴愬姛"))
});
- this.$refs.crud.toggleSelection();
});
},
PUSH(){
if (this.selectionList.length != 1) {
- this.$message.error('璇烽�夋嫨鏁版嵁')
+ this.$message.warning('璇烽�夋嫨鏁版嵁')
return false;
}
this.$confirm("鏄惁瑕�"+ (this.selectionList[0].pushType == "1" ? "鎺ㄩ�佹暟鎹�" : "鎺ㄩ�佸垎绫�"), {
@@ -322,10 +325,10 @@
this.loading = true;
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
+ debugger;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
- this.data = res.data.data.records;
});
},
rowClick(row) {
@@ -341,43 +344,57 @@
}
},
openAdvancedQuery(){
- this.advancedQueryParam.options = [
- {
- data: [],
- title: '缂栧彿',
- fieldType: 'text',
- queryField: 'id',
- },{
- data: [],
- title: '鍚嶇О',
- fieldType: 'text',
- queryField: 'name',
- },{
- data: [],
- title: '鎻忚堪',
- fieldType: 'text',
- queryField: 'description',
- },{
- data: [
- // {
- // key: '缂栬緫涓�',
- // value: 'Editing',
- // },
- // {
- // key: '宸插彂甯�',
- // value: 'Released',
- // },
- // {
- // key: '鍋滅敤',
- // value: 'Disabled',
- // },
- ],
- title: '鐘舵��',
- fieldType: 'combox',
- queryField: 'lcStatus',
- comboxKey: 'codeSearchLCStatus',
- },
- ]
+ this.advancedQueryParam.options = [{
+ data: this.pushTypeList,
+ title: '鎺ㄩ�佺被鍨�',
+ queryField: 'pushType',
+ fieldType: 'combox',
+ comboxKey: 'searchPushType'
+ }, {
+ title: '绯荤粺鍚嶇О',
+ queryField: 'sysBaseName',
+ fieldType: 'text'
+ }, {
+ title: '绯荤粺缂栧彿',
+ queryField: 'sysBaseId',
+ fieldType: 'text'
+ }, {
+ title: '鎺ュ彛鍑芥暟',
+ queryField: 'interfaceFunction',
+ fieldType: 'text'
+ }, {
+ title: '鍛藉悕绌洪棿',
+ queryField: 'nameSpace',
+ fieldType: 'text'
+ }, {
+ title: 'soapAction',
+ queryField: 'soapAction',
+ fieldType: 'text'
+ }, {
+ title: '鍙傛暟鍚嶇О',
+ queryField: 'targName',
+ fieldType: 'text'
+ }, {
+ title: '璋冪敤鏂瑰紡',
+ queryField: 'cxfaxis',
+ fieldType: 'text'
+ }, {
+ title: '璇锋眰鍦板潃',
+ queryField: 'requestUrl',
+ fieldType: 'text'
+ }, {
+ title: '鍙傛暟绫诲瀷',
+ queryField: 'paramType',
+ fieldType: 'combox',
+ comboxKey: 'searchparamType',
+ data:this.paramTypeList
+ }, {
+ title: '杩斿洖鍊肩被鍨�',
+ queryField: 'returnType',
+ fieldType: 'combox',
+ comboxKey: 'searchreturnType',
+ data:this.returnTypeList
+ }]
this.advancedQueryParam.currentOpen = 'info';
this.advancedQueryParam.advancedQuerySettingBox = true;
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index 8bd4c89..fd9e3c5 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -105,7 +105,7 @@
<el-form-item v-if="formData.pushType=='7'" label="鏄惁鏌ヨ闆嗗洟鐮�" prop="isGroupCodeFlag">
<el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
</el-form-item>
- <el-form-item label="绯荤粺鎻忚堪" style="width: 850px;">
+ <el-form-item label="绯荤粺鎻忚堪" style="width: 850px;" prop="description">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 5}" v-model="formData.description" style="width: 740px;"></el-input>
</el-form-item>
<el-form-item v-if="formData.interfaceType=='http'" label="璇锋眰鏂瑰紡" prop="requestMethod">
--
Gitblit v1.9.3