gx

src/view/dialog/dialogRW.vue

@@ -41,16 +41,18 @@
         </div>
         <div style="width: 100%; height: calc(100% - 110px)" class="table-els">
           <div class="tabelHead">
-            <div><span>姓名：</span>{{ data.character.xm }}</div>
+            <div><span>姓名：</span>{{ data.character.nl }}</div>
             <div><span>地址：</span>{{ data.character.dz }}</div>
             <div><span>年龄：</span>{{ data.character.age }}</div>
             <div><span>标签：</span>{{ data.character.titleName }}</div>
             <div class="status">
-              <span>状态：</span>
+              <div class="statusMessage">
-              <img :src="lampImages[data.character.zt]" @click="escalation" />
+                <span>状态：</span>
+                <img :src="lampImages[data.character.deng]" @click="escalation" />
+              </div>
+              <div class="lampMessage">(工作日早上8:30自动推送浙政钉)</div>
               <div class="lampBox" v-if="clicked">
                 <div class="lampTitle">确定要上报吗?</div>
-                <div class="lampMessage">注：工作日早上8:30，自动推送</div>
                 <div class="lampBtn">
                   <div class="confirm" @click="confirmEvent()">上报</div>
                   <div class="cancel" @click="cancelEvent()">取消</div>
@@ -107,7 +109,7 @@
           </el-table>
         </div>
 
-        <div class="pagePart">
+        <!-- <div class="pagePart">
           <el-pagination
             background
             layout="prev, pager, next,total"
@@ -118,7 +120,7 @@
             @current-change="handle"
             v-model:current-page="pagination.currentPage"
           />
-        </div>
+        </div> -->
       </div>
     </el-dialog>
   </div>
@@ -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) {
+  // :deep(.el-pagination) {
-    --el-pagination-button-disabled-bg-color: none;
+  //   --el-pagination-button-disabled-bg-color: none;
-    --el-pagination-bg-color: none;
+  //   --el-pagination-bg-color: none;
-    --el-pagination-button-bg-color: none;
+  //   --el-pagination-button-bg-color: none;
-    --el-pagination-button-color: #fff;
+  //   --el-pagination-button-color: #fff;
-    color: #fff;
+  //   color: #fff;
-  }
+  // }
 
-  :deep(.el-pagination button:disabled) {
+  // :deep(.el-pagination button:disabled) {
-    background-color: rgba(0, 116, 255, 0) !important;
+  //   background-color: rgba(0, 116, 255, 0) !important;
-  }
+  // }
-  :deep(.el-pagination > .is-last) {
+  // :deep(.el-pagination > .is-last) {
-    color: #ffffff;
+  //   color: #ffffff;
-  }
+  // }
 }
 
 .progressGreen {

src/view/sy_table.vue

@@ -185,7 +185,7 @@ const router = useRouter();
 const routers = useRoute();
 // 路由跳转
 const goto = (val) => {
-  console.log('跳转',val);
+  console.log("跳转", val);
 
   // const availableRoutes = [
   //   "最低生活保障",
@@ -201,15 +201,15 @@ const goto = (val) => {
   //     query: { name: val.name, id: val.id },
   //   });
   // } else {
-    router.push({
+  router.push({
-      path: "/home/index/table/details",
+    path: "/home/index/table/details",
-      query: { name: val.name, id: val.id },
+    query: { name: val.name, id: val.id, xh: val.xh },
-    });
+  });
 
-    // ElMessage.warning({
+  // ElMessage.warning({
-    //   message: `${val.name}暂无数据!`,
+  //   message: `${val.name}暂无数据!`,
-    //   offset: 100, // 距离窗口顶部的偏移量
+  //   offset: 100, // 距离窗口顶部的偏移量
-    // });
+  // });
   // }
 };
 
@@ -651,11 +651,10 @@ const getData = async (name, fullName) => {
               Bj: data.Bj[imageIndex],
               name: item.sx,
               text: item.bmfxqk,
-              // progress: item.xh,
+              xh: item.xh,
               progress: "95", //进度条
             });
             // console.log( data.tabPublicService);
-            
           });
         }
       }