From 238121be19655f63a45fc9c9c3d864801eb4471b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 12:44:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 1
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 4 +-
Source/UBCS-WEB/src/views/integration/vciAttribute.vue | 5 --
Source/UBCS-WEB/src/views/monitor/log/operateLog.vue | 49 ++++++++++++++++++++++--
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 8 +---
5 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index b31faac..cc598dd 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1398,7 +1398,7 @@
},
{
label: "澶氳鏂囨湰",
- prop: "textareaFlag",
+ prop: "textAreaFlag",
cell: false,
edit: "switch"
},
@@ -1619,7 +1619,7 @@
value: 'sortAttrFlag',
label: '鍒楄〃鎺掑簭'
}, {
- value: 'textareaFlag',
+ value: 'textAreaFlag',
label: '澶氳鏂囨湰'
}, {
value: 'imageFlag',
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 4fdffbe..ffbb8c7 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -216,6 +216,7 @@
width: 150,
type: "textarea",
slot: true,
+ hide:true,
},
{
label:'杩斿洖鍙傛暟',
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index 083d865..9f9d493 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -309,7 +309,6 @@
// const groupReturnData = res.data && res.data.data ? res.data.data.map(item => item.groupAttrKey) : [];
const groupReturnData = res.data.data;
// 杩囨护鍖归厤
- // console.log(groupReturnData)
this.mappingData.forEach(mappingItem => {
groupReturnData.forEach(groupItem => {
if (mappingItem.sourceAttrKey === groupItem.groupAttrKey) {
@@ -329,7 +328,6 @@
this.$message.success('鑷姩濉厖鎴愬姛锛岃纭灞炴�у悗鐐瑰嚮淇濆瓨锛�');
})
.catch(error => {
- console.log(error)
this.$message.error('濉厖澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
});
},
@@ -440,7 +438,6 @@
this.rangeData = []
const response = await gridAttrRanges({meatId: oid})
if (response.status === 200) {
- // console.log(response.data)
this.rangeData = response.data.data
}
},
@@ -581,7 +578,6 @@
}
},
handelTransferSave(event) {
- // console.log(event)
let that = this
const transferValue = event.value
if (Object.keys(that.mappingForm).length == 0) {
@@ -693,7 +689,7 @@
});
}
} catch (error) {
- console.error('澶勭悊鏄犲皠鏇存柊鏃跺嚭閿欙細', error);
+ this.$message.error(error)
} finally {
done();
}
@@ -710,7 +706,7 @@
}
},
setCurrentRow(selection, row) {
- console.log(selection, row)
+
this.mappingForm = row
this.disabledPush = false
},
diff --git a/Source/UBCS-WEB/src/views/integration/vciAttribute.vue b/Source/UBCS-WEB/src/views/integration/vciAttribute.vue
index 33230eb..3db4280 100644
--- a/Source/UBCS-WEB/src/views/integration/vciAttribute.vue
+++ b/Source/UBCS-WEB/src/views/integration/vciAttribute.vue
@@ -129,7 +129,6 @@
},
methods: {
searchHandler() {
- console.log(this.searchSelect)
const params = {
[`conditionMap[${this.searchSelect}_like]`]: this.searchValue,
page: this.page.currentPage,
@@ -191,12 +190,9 @@
// row.codeMetaAttrName鍥犱负涓嬫媺妗唙alue鍊煎師鍥犵粦瀹氫负codeMetaAttrOid
let updataList = []
- // console.log(this.ChangeName)
- // console.log(row.codeMetaAttrName)
// if (this.ChangeName && this.ChangeName === row.codeMetaAttrName) {
// updataList = this.codeMetaColumn.dicData.find(item => item.codeMetaAttrOid === row.codeMetaAttrOid)
// } else {
- // console.log('2')
// updataList = this.codeMetaColumn.dicData.find(item => item.codeMetaAttrOid === row.codeMetaAttrName)
// }
updataList = this.codeMetaColumn.dicData.find(item => item.codeMetaAttrOid === row.codeMetaAttrName)
@@ -266,7 +262,6 @@
this.$message.success('淇濆瓨鎴愬姛锛�')
await this.onLoad()
}
-
}
},
async syncHandler() {
diff --git a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
index e77e7d9..cbb013c 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
@@ -19,6 +19,21 @@
<small slot="more">...</small>
</avue-text-ellipsis>
</template>
+ <template slot="menuLeft">
+ <span style="width: 200px;display: inline-block">
+ <el-select slot="prepend" v-model="searchSelect" placeholder="璇烽�夋嫨" size="small">
+ <el-option v-for="item in searchData" :key="item.prop" :label="item.label" :value="item.prop"
+ ></el-option>
+ </el-select>
+ </span>
+ <span style="margin-left: 5px">
+ <el-input v-model="searchValue" class="attrSearch" clearable placeholder="璇疯緭鍏ュ唴瀹�"
+ prefix-icon="el-icon-search"
+ size="small" type="text"></el-input>
+ <el-button icon="el-icon-search" plain size="small" type="primary"
+ @click="searchHandler"> 鎼滅储</el-button>
+ </span>
+ </template>
</avue-crud>
</basic-container>
</template>
@@ -30,6 +45,23 @@
export default {
data() {
return {
+ searchSelect: "userName",
+ searchValue: '',
+ searchData: [
+ {
+ label: "鐢ㄦ埛鍚�",
+ prop: "userName",
+ align: "left",
+ display: false,
+ width: 200,
+ required: true
+ }, {
+ label: "濮撳悕",
+ prop: "realName",
+ align: "left",
+ display: false
+ }
+ ],
form: {},
selectionList: [],
query: {},
@@ -48,7 +80,7 @@
calcHeight: 20,
columnBtn:false,
tip: false,
- searchShow: true,
+ searchShow: false,
searchMenuSpan: 6,
border: true,
index: true,
@@ -74,22 +106,21 @@
{
label: "鐢ㄦ埛ip",
prop: "ip",
- width:'130'
},
{
label: "妯″潡",
prop: "model",
- width:'140'
+
},
{
label: "鏃堕棿",
prop: "time",
- width:'160'
+
},
{
label: "鎿嶄綔缁撴灉",
prop: "operateResult",
- width:'110'
+
},
{
label: "鎻忚堪",
@@ -97,6 +128,7 @@
span: 24,
minRows: 20,
type: "textarea",
+ hide:true,
slot: true,
},
]
@@ -116,6 +148,13 @@
this.getRouteParam()
},
methods: {
+ searchHandler(){
+ let params = {
+ [this.searchSelect]:this.searchValue
+ };
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ },
//鑾峰彇鏁版嵁
getRouteParam() {
const logType = this.$route.query.log_type; // 鑾峰彇log_type鍙傛暟鐨勫��
--
Gitblit v1.9.3