diff --git a/dist.zip b/dist.zip
index abdb713..0668d3e 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index cd5e2d8..f4728f3 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -51,7 +51,7 @@
状态:
-
(工作日早上8:30自动推送浙政钉)
+
确定要上报吗?
@@ -61,55 +61,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 注:工作日早上8:30自动推送浙政钉
@@ -371,6 +374,7 @@ const closeDialog = () => {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ margin-top: 46px;
img {
width: 36px;
height: 36px;
@@ -389,18 +393,7 @@ const closeDialog = () => {
display: flex;
align-items: center;
}
- .lampMessage {
- font-size: 16px;
- font-weight: 600;
- font-family: PingFangSC, PingFang SC;
- letter-spacing: 1px;
- color: #ff5959;
- width: 262px;
- position: absolute;
- top:81px;
- left: -198px;
- z-index: 10;
- }
+
.lampBox {
width: 270px;
height: 146px;
@@ -449,7 +442,20 @@ const closeDialog = () => {
}
}
}
+
}
+ .lampMessage {
+ font-size: 16px;
+ font-weight: 600;
+ font-family: PingFangSC, PingFang SC;
+ letter-spacing: 1px;
+ color: #ff5959;
+ width: 100%;
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 17px;
+ z-index: 10;
+ }
:deep(.el-table) {
--el-table-bg-color: none;
@@ -493,15 +499,15 @@ const closeDialog = () => {
width: 181px;
height: 15px;
margin: 0 auto;
- border-radius: 8px;
+ border-radius: 6px;
background: linear-gradient(358deg, #21eda8 0%, #8bffcd 100%);
}
.progressYellow {
width: 181px;
height: 15px;
- border: 2px dashed #ffe1a5;
+ border: 2px solid #ffe1a5;
margin: 0 auto;
- border-radius: 8px;
+ border-radius: 6px;
}
.bo {
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index 542b65e..6289895 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -228,10 +228,10 @@ import { useRouter, useRoute } from "vue-router";
import http from "@/utils/request.js";
import { ElMessage } from "element-plus";
import DialogLamp from "./dialog/dialogRW.vue";
-
import lamp1 from "../assets/sy-table/green.gif";
import lamp2 from "../assets/sy-table/red.gif";
-import lamp3 from "../assets/sy-table/yellow.gif";
+import lamp3 from "../assets/sy-table/lampYellow1.gif";
+// import lamp3 from "../assets/sy-table/yellow.gif";
import lamp4 from "../assets/sy-table/green1.gif";
import lamp5 from "../assets/sy-table/red1.gif";
import lamp6 from "../assets/sy-table/yellow1.gif";