diff --git a/public/index.html b/public/index.html index 925455ca..49736f55 100644 --- a/public/index.html +++ b/public/index.html @@ -30,6 +30,8 @@ width: 100%; height: 100%; z-index: 999999; + display: flex;align-items: center;justify-content: center; + background: #E5EEF5; } #loader { @@ -193,15 +195,26 @@ color: #FFF; opacity: 0.5; } + .bgStyle{ + width: 13%; + height: 17%; + border-radius: 10px; + background-image: url('./lodingCar.gif'); + background-size: 100% 100%; + background-repeat: no-repeat; + background-position: center; + }
-
-
-
-
正在加载系统资源,请耐心等待
+ + + +
+
diff --git a/public/lodingCar.gif b/public/lodingCar.gif new file mode 100644 index 00000000..cc3997a7 Binary files /dev/null and b/public/lodingCar.gif differ diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue index 56f5a6b9..5d4d09b6 100644 --- a/src/components/Pagination/index.vue +++ b/src/components/Pagination/index.vue @@ -103,7 +103,7 @@ export default { } - diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue index 9ac17ff1..824b4c73 100644 --- a/src/views/EquipmentLedger/index.vue +++ b/src/views/EquipmentLedger/index.vue @@ -343,17 +343,25 @@
- - -
+ + +
装备列表 共 {{ total }} 条记录 -
- +
+
+
+ + + -
- +
- +
审批进度
@@ -10,7 +10,10 @@ :timestamp="getNodeRecord(node) ? getNodeRecord(node).approveTime : ''" placement="top" :type="getNodeTagType(node)" - > + > +
节点{{ node.nodeOrder }}:{{ node.nodeName }} @@ -144,6 +147,7 @@ export default { .node-title { display: flex; align-items: center; + justify-content: space-between; gap: 10px; margin-bottom: 8px; @@ -154,10 +158,17 @@ export default { } .node-info { - font-size: 12px; - color: #606266; + font-size: 12px; + background: rgba(52, 226, 199,0.08); + color: #3F3F3F; + padding: 15px; + border-radius:5px; line-height: 1.8; } } } +.custom-icon{ + width: 20px; + height: 20px; +} diff --git a/src/views/stockManagement/storageRecord/index.vue b/src/views/stockManagement/storageRecord/index.vue index 79a9b335..5e2bc350 100644 --- a/src/views/stockManagement/storageRecord/index.vue +++ b/src/views/stockManagement/storageRecord/index.vue @@ -83,13 +83,7 @@ - - - 下载 - 打印 - - - +

入库记录单

@@ -143,6 +137,13 @@
+
@@ -279,8 +280,8 @@ export default { line-height: 40px; } .btns { - position: absolute; - right: 20px; - top: 60px; + // position: absolute; + // right: 20px; + // top: 60px; }