From 41aacf110288329a6beb494ccccaeabd217a08b9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 36a1bd8..023a104 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -23,7 +23,7 @@
</template>
<script>
-import {getList} from "@/api/docking/loge";
+import {getLogoList} from "@/api/docking/loge";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
@@ -90,6 +90,20 @@
prop: 'interfaceStatus',
value:7
},
+ {
+ label: '鏍囧噯鐢宠',
+ prop: 'applyCodeForBZ',
+ value:8 },
+ {
+ label: '閮ㄩ棬鐢宠',
+ prop: 'syncDataForOrg',
+ value:9
+ },
+ {
+ label: '浜哄憳鐢宠',
+ prop: 'syncDataForPerson',
+ value:10
+ },
],
},
loading: false,
@@ -104,9 +118,9 @@
option: {
height:'auto',
calcHeight: 0,
+ columnBtn:false,
tip: false,
searchShow: false,
- // searchMenuSpan: 12,
border: true,
index: true,
viewBtn: true,
@@ -140,6 +154,24 @@
sortable:true,
overHidden: true,
width: 140
+ },
+ {
+ label: '鏍囧噯鐢宠',
+ prop: 'applyCodeForBZ',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '閮ㄩ棬鐢宠',
+ prop: 'syncDataForOrg',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '浜哄憳鐢宠',
+ prop: 'syncDataForPerson',
+ sortable:true,
+ width: 130
},
{
label: '闆嗘垚绯荤粺缂栧彿',
@@ -199,7 +231,7 @@
value: "key"
},
formatter : function (row, column) {
- return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: limegreen;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: red;font-size: 20px;font-weight: 800"></i>'
+ return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
}
},
]
@@ -271,7 +303,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ getLogoList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
@@ -287,6 +319,20 @@
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+// 婊氬姩鏉℃牱寮忎慨鏀�
+// 婊氬姩鏉＄殑瀹藉害
+ /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+ height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+ background: white;
+ border: white;
+ width: 10px;
+ }
+// 婊氬姩鏉＄殑婊戝潡
+ /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+ background-color: #ececec;
+ border-radius: 20px;
+ border: #ececec;
+ }
</style>
--
Gitblit v1.9.3