diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue index bf4bd47..cf8106f 100644 --- a/src/view/dialog/dialogRW.vue +++ b/src/view/dialog/dialogRW.vue @@ -41,16 +41,18 @@
-
姓名:{{ data.character.xm }}
+
姓名:{{ data.character.nl }}
地址:{{ data.character.dz }}
年龄:{{ data.character.age }}
标签:{{ data.character.titleName }}
- 状态: - +
+ 状态: + +
+
(工作日早上8:30自动推送浙政钉)
确定要上报吗?
-
注:工作日早上8:30,自动推送
上报
取消
@@ -107,7 +109,7 @@
-
+
@@ -174,10 +176,6 @@ const props = defineProps({ return ""; }, }, - pagination: { - type: Object, - required: true, - }, character: { type: Object, required: true, @@ -200,7 +198,7 @@ const handleRowClick = (row, column, event) => { const clicked = ref(false); const lampBox = ref(null); const escalation = () => { - if (data.character.zt !== 1) { + if (data.character.deng !== 0) { clicked.value = true; } console.log(clicked.value); @@ -239,7 +237,7 @@ const data = reactive({ columns: [], tableData: [], character: [], - pagination: {}, + // pagination: {}, }); // 使用对象存储所有图片路径 const lampImages = { @@ -343,6 +341,7 @@ const handle = (current) => { width: 36px; height: 36px; } + // &div:nth-last-child(1){ // display: flex; // align-items: center; @@ -350,8 +349,24 @@ const handle = (current) => { .status { display: flex; align-items: center; - cursor: pointer; position: relative; + cursor: pointer; + .statusMessage { + display: flex; + align-items: center; + } + .lampMessage { + font-size: 15px; + font-weight: 500; + font-family: PingFangSC, PingFang SC; + letter-spacing: 1px; + color: #ff5959; + width: 190px; + position: absolute; + top: 40px; + left: -10px; + z-index: 10; + } .lampBox { width: 270px; height: 146px; @@ -365,7 +380,7 @@ const handle = (current) => { .lampTitle { text-align: center; // padding-top: 33px; - margin: 28px 0 10px 0; + margin: 28px 0 32px 0; font-size: 16px; font-weight: 500; font-family: PingFangSC, PingFang SC; @@ -373,17 +388,7 @@ const handle = (current) => { line-height: 22px; letter-spacing: 1px; } - .lampMessage { - text-align: center; - // padding-top: 33px; - margin: 10px 0 14px 0; - font-size: 14px; - font-weight: 500; - font-family: PingFangSC, PingFang SC; - line-height: 22px; - letter-spacing: 1px; - color: #ff5959; - } + .lampBtn { display: flex; align-items: center; @@ -434,20 +439,20 @@ const handle = (current) => { align-items: center; justify-content: center; - :deep(.el-pagination) { - --el-pagination-button-disabled-bg-color: none; - --el-pagination-bg-color: none; - --el-pagination-button-bg-color: none; - --el-pagination-button-color: #fff; - color: #fff; - } + // :deep(.el-pagination) { + // --el-pagination-button-disabled-bg-color: none; + // --el-pagination-bg-color: none; + // --el-pagination-button-bg-color: none; + // --el-pagination-button-color: #fff; + // color: #fff; + // } - :deep(.el-pagination button:disabled) { - background-color: rgba(0, 116, 255, 0) !important; - } - :deep(.el-pagination > .is-last) { - color: #ffffff; - } + // :deep(.el-pagination button:disabled) { + // background-color: rgba(0, 116, 255, 0) !important; + // } + // :deep(.el-pagination > .is-last) { + // color: #ffffff; + // } } .progressGreen { diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 33a3b38..c15afc6 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -3,8 +3,8 @@
- - 服务对象清单({{ formData.name }}) + + 服务对象清单({{ data.name }})
@@ -63,7 +63,7 @@
- 服务内容清单(共{{ data.tableData1.length }}项) + 服务内容清单(共{{ pagination1.total }}项)
@@ -75,7 +75,7 @@
-
-
- - -
@@ -171,7 +140,6 @@ :row-style="rowState" :header-cell-style="tableHeaderColor" > -