diff --git a/src/assets/imgs/bg_block.png b/src/assets/imgs/bg_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..558b93e95bacd2055426dd9a8b73a4d31a5f5563
Binary files /dev/null and b/src/assets/imgs/bg_block.png differ
diff --git a/src/assets/imgs/bg_block_hov.png b/src/assets/imgs/bg_block_hov.png
new file mode 100644
index 0000000000000000000000000000000000000000..94bd95eabebb7c474d9f40bb81837a93f7277ce1
Binary files /dev/null and b/src/assets/imgs/bg_block_hov.png differ
diff --git a/src/assets/imgs/bg_mblock.png b/src/assets/imgs/bg_mblock.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d3276b3ec05a5f8092c13d9fe502f404434bf9b
Binary files /dev/null and b/src/assets/imgs/bg_mblock.png differ
diff --git a/src/assets/imgs/ic_newdata.png b/src/assets/imgs/ic_newdata.png
new file mode 100644
index 0000000000000000000000000000000000000000..147b4361f7787afb25ecbf007d1ef1e78af72e84
Binary files /dev/null and b/src/assets/imgs/ic_newdata.png differ
diff --git a/src/assets/imgs/ic_olddata.png b/src/assets/imgs/ic_olddata.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfd5c72e2350189ddda4c0ef41ba61a88890df66
Binary files /dev/null and b/src/assets/imgs/ic_olddata.png differ
diff --git a/src/assets/imgs/ic_updata_cloud.png b/src/assets/imgs/ic_updata_cloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a1f57138fc7a15bac41f4ece1992297d497eff
Binary files /dev/null and b/src/assets/imgs/ic_updata_cloud.png differ
diff --git a/src/components/table-filter.vue b/src/components/table-filter.vue
new file mode 100644
index 0000000000000000000000000000000000000000..40ce3b5d9f897e706d0d3a9ef65dde6836e4a744
--- /dev/null
+++ b/src/components/table-filter.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+
diff --git a/src/components/table-um.vue b/src/components/table-um.vue
index 1aa76d41bda624fdfc59b7f857f5b4fca55bf040..e927b4491473082a4dad01cf4d64499721752dd0 100644
--- a/src/components/table-um.vue
+++ b/src/components/table-um.vue
@@ -37,46 +37,11 @@
class="ces_toolbar_inp"
>
-
+
-1
- );
- },
filterAction() {
this.showFliterList = !this.showFliterList;
- this.getFilterLength();
- },
- getFilterLength() {
- if (this.showFliterList) {
- this.$nextTick(() => {
- let width =
- this.$refs.filterContainer.getBoundingClientRect().width -
- 20 * 2 - // 两侧padding
- 100 - // 左侧标题
- 20 - // 距左侧标题的边距
- 110; // 折叠按钮的宽度
-
- this.filterLength = Math.floor(width / 110);
- // console.log("每行最多可容纳" + this.filterLength + "个filter");
- });
- }
- },
- filterToggleAction(prop) {
- this.$set(this.filterToggle, prop, !this.filterToggle[prop]);
- },
- initFilterData() {
- if (this.filterList && this.filterList.length) {
- this.filterData = {};
- this.filterToggle = {};
- this.filterList.forEach((item) => {
- this.$set(this.filterData, item.prop, []);
- this.$set(this.filterToggle, item.prop, false);
- });
- }
- },
- selectFilter(prop, filter) {
- if (this.isCurrentFilter(prop, filter)) {
- this.filterData[prop].splice(this.filterData[prop].indexOf(filter), 1);
- } else {
- this.filterData[prop].push(filter);
- }
- console.log(this.filterData);
},
+ filterChange(filter) {
+ console.log(filter);
+ }
},
};
@@ -796,75 +707,6 @@ em {
text-overflow: ellipsis;
white-space: nowrap;
}
-.ces_filter_container {
- background-color: #f7f8f9;
- padding: 14px 19px;
- border: 1px solid #e3e5ef;
- border-radius: 6px;
- margin: 0 0 10px;
-}
-.ces_filter_container > li {
- display: flex;
- justify-content: flex-start;
- align-items: flex-start;
- padding-top: 12px;
-}
-.ces_filter_name {
- width: 100px;
- height: 30px;
- flex-shrink: 0;
- text-align: right;
- font-size: 14px;
- line-height: 30px;
- font-weight: bold;
- color: #1a2236;
-}
-.ces_filter_data {
- width: calc(100% - 120px);
- padding-right: 110px;
- box-sizing: border-box;
- margin-left: 20px;
- flex-grow: 1;
- display: inline-flex;
- flex-wrap: wrap;
- justify-content: flex-start;
- align-items: flex-start;
- padding-bottom: 11px;
- position: relative;
-}
-.ces_filter_container > li:not(:last-child) > .ces_filter_data {
- border-bottom: 1px solid #e9ecf3;
-}
-.ces_filter_data > li {
- flex-shrink: 0;
- padding-right: 20px;
-}
-.ces_filter_data > .toggle_bar {
- height: 30px;
- position: absolute;
- top: 0;
- right: 0;
- font-size: 14px;
- line-height: 30px;
- color: #0f2683;
- cursor: pointer;
-}
-.ces_filter_data > li > a {
- display: block;
- height: 30px;
- width: 90px;
- box-sizing: border-box;
- border-radius: 12px;
- text-align: center;
- cursor: pointer;
- font-size: 14px;
- line-height: 30px;
- color: #58617a;
-}
-.ces_filter_data > li > a.current {
- background-color: #515fe7;
- color: #f4f7fc;
-}
.ces_page_item {
display: flex;
justify-content: flex-end;
diff --git a/src/pages/fwglList.vue b/src/pages/fwglList.vue
index cd6962d793b814ac986ea7787b531cfed670662f..4c21276f51da606ccf44b6c083ec90aaae374cca 100644
--- a/src/pages/fwglList.vue
+++ b/src/pages/fwglList.vue
@@ -6,7 +6,7 @@
{{ pathName }}
-
+
diff --git a/src/pages/yyglList.vue b/src/pages/yyglList.vue
index 863d78b1eff51a08774e2553f22edb2022f911b5..d5da93e45edfcede241f3d18844127b9e577c406 100644
--- a/src/pages/yyglList.vue
+++ b/src/pages/yyglList.vue
@@ -6,7 +6,7 @@
{{ pathName }}
-
+
@@ -44,14 +44,14 @@ export default {
.list_container {
padding: 0 20px;
}
-.table_container {
+.main_container {
height: calc(100% - 75px);
padding: 15px 20px;
border-radius: 10px;
overflow: hidden;
background-color: #fff;
}
-.table_container .ces-table-page {
+.main_container .ces-table-page {
margin-top: 42px;
}