diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 411b3e91..b5530740 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -19,8 +19,10 @@
@click="handleMenuClick(item)"
>
@@ -122,7 +122,9 @@
{{ item.businessName }}-{{ item.statusType }}
- {{ item.deptAbbreviation ? item.deptAbbreviation + '-' : '' }}{{ item.applyUser }}-{{ item.applyTime }}
+ {{ item.deptAbbreviation ? item.deptAbbreviation + '-' : '' }}{{ item.applyUser }}-{{
+ item.applyTime
+ }}
@@ -525,7 +527,7 @@ export default {
created() {
this.getUser()
this.menuList = this.sidebarRouters.filter((route) => !route.hidden && route.path !== '/')
- this.menuList = this.menuList.slice(1)
+ // this.menuList = this.menuList.slice(1)
this.getEventList()
this.getRetireList()
},
@@ -1354,4 +1356,20 @@ export default {
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
}
+
+.com {
+ margin: 9px 0;
+ display: flex;
+ align-items: center;
+ width: 135px;
+ height: 32px;
+ color: #fff;
+ background-image: linear-gradient(180deg, #08c6a9, #13e0c0);
+ font-weight: 700;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ border-radius: 4px;
+ cursor: pointer;
+}
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 132627fc..14dbeb29 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -57,13 +57,13 @@
-
diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue
index bf1b4ab0..5d42ba09 100644
--- a/src/views/EquipmentLedger/index.vue
+++ b/src/views/EquipmentLedger/index.vue
@@ -359,11 +359,26 @@
-
+
+
+
+
+
+ {{ searchExpanded2 ? '收起' : '展开' }}
+
+
+
+
@@ -1023,6 +1038,7 @@ export default {
showFieldSetting: false, // 字段设置弹窗控制
// 搜索区域展开状态
searchExpanded: false,
+ searchExpanded2: true,
selectedColumns: [],
// 表单数据
formData: {
diff --git a/src/views/home/components/provincial/Top1.vue b/src/views/home/components/provincial/Top1.vue
index 310b3501..799dcf15 100644
--- a/src/views/home/components/provincial/Top1.vue
+++ b/src/views/home/components/provincial/Top1.vue
@@ -272,7 +272,7 @@ export default {
}
.price-text {
font-family: OpenSans-BoldItalic;
- font-size: 24px;
+ font-size: 28px;
color: #2CBAB2;
}
.num-text {
diff --git a/src/views/home/components/provincial/Top2.vue b/src/views/home/components/provincial/Top2.vue
index 6e0e4ba2..415cc59d 100644
--- a/src/views/home/components/provincial/Top2.vue
+++ b/src/views/home/components/provincial/Top2.vue
@@ -559,7 +559,7 @@ export default {