From 2fa3a4ad09d4d20fcda0b459a675403a3d97f0fc Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Sat, 14 Sep 2024 17:29:45 +0800
Subject: [PATCH] lq

---
 src/view/dialog/dialogRW.vue | 87 +++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index e1f61b4..4ce52c7 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -41,17 +41,14 @@
         </div>
         <div style="width: 100%; height: calc(100% - 110px)" class="table-els">
           <div class="tabelHead">
-            <div><span>姓名：</span>{{data.xq.xm }}</div>
+            <div><span>姓名：</span>{{ data.xq.xm }}</div>
             <div><span>地址：</span>{{ data.xq.dz }}</div>
-            <div><span>年龄：</span>{{data.xq.nl }}</div>
+            <div><span>年龄：</span>{{ data.xq.nl }}</div>
             <div><span>标签：</span>{{ data.xq.bq }}</div>
             <div class="status">
               <div class="statusMessage">
                 <span>状态：</span>
-                <img
-                  :src="lampImages[data.xq.deng]"
-                  @click="escalation"
-                />
+                <img :src="lampImages[data.xq.deng]" @click="escalation" />
               </div>
               <div class="lampMessage">(工作日早上8:30自动推送浙政钉)</div>
               <div class="lampBox" v-if="clicked">
@@ -64,8 +61,8 @@
             </div>
           </div>
 
-          <el-table 
-            :data="data.tableData"     
+          <el-table
+            :data="data.tableData"
             height="100%"
             :header-cell-style="{ background: 'rgba(0, 143, 205, 0.63)' }"
             @row-click="handleRowClick"
@@ -81,9 +78,11 @@
                 <template #default="scope">
                   <!-- 状态 -->
                   <div v-if="item.property == 'deng'">
-      
                     <div v-if="scope.row.deng == 1" class="progressGreen"></div>
-                    <div v-if="scope.row.deng == 2" class="progressYellow"></div>
+                    <div
+                      v-if="scope.row.deng == 2"
+                      class="progressYellow"
+                    ></div>
                     <!-- <div v-for="index in 3" :key="index">
                       <img
                         style="width: 30px; height: 30px"
@@ -111,7 +110,6 @@
             </template>
           </el-table>
         </div>
-
       </div>
     </el-dialog>
   </div>
@@ -197,16 +195,16 @@ const handleRowClick = (row, column, event) => {
 const clicked = ref(false);
 const lampBox = ref(null);
 const escalation = () => {
-  if (data.character.deng !== 0) {
+  if (data.xq.deng !== 0) {
     clicked.value = true;
   }
   console.log(clicked.value);
 };
 
 const confirmEvent = () => {
-  console.log("confirm!", data.character);
+  console.log("confirm!", data);
   let ReportedDto = {
-    sfzhm: data.tableData.xq.sfzhm,
+    sfzhm: data.xq.sfzhm,
     type: data.tableType.typeId,
   };
   http.post(`/api/ggfwyth/pg/reported`, ReportedDto).then((res) => {
@@ -234,7 +232,7 @@ const data = reactive({
   typeId: "",
   columns: [],
   tableData: [],
-  xq:{},
+  xq: {},
   // pagination: {},
 });
 // 使用对象存储所有图片路径
@@ -257,35 +255,42 @@ watch(
   (newVal, oldVal) => {
     console.log(11111111);
     dialogShow.value = newVal;
-    if(props.dialogShow==true){
+    if (props.dialogShow == true) {
       console.log(333);
       console.log(props.tableData);
-      data.xq=props.tableData.data.xq;
+      data.xq = props.tableData.data.xq;
       // data.tableData=props.tableData.data;
-      data.title=props.tableData.title;
-      data.columns=props.tableData.columns;
-      if(props.tableData.data.wxs.length>0){
-      props.tableData.data.wxs.forEach((item,index)=>{
-        let obj={
-          deng:2,
-          fwsx:item.fwsx,
-        }
-        data.tableData.push(obj);
-      })
-    }
+      data.title = props.tableData.title;
+      data.columns = props.tableData.columns;
+      data.tableData.length = [];
+      if (props.tableData.data.wxs.length > 0) {
+        props.tableData.data.wxs.forEach((item, index) => {
+          let obj = {
+            deng: 2,
+            fwsx: item.fwsx,
+          };
+          data.tableData.push(obj);
+        });
+      }
+      data.tableData.length = [];
+      if (props.tableData.data.ysx.length > 0) {
+        console.log(444);
 
-    if(props.tableData.data.ysx.length>0){
-      console.log(444);
-      
-      props.tableData.data.ysx.forEach((item,index)=>{
-        let obj={
-          deng:1,
-          fwsx:item.fwsx,
-        }
-        data.tableData.push(obj);
-      })
-    }
-    
+        props.tableData.data.ysx.forEach((item, index) => {
+          let obj = {
+            deng: 1,
+            fwsx: item.fwsx,
+          };
+          data.tableData.push(obj);
+        });
+      }
+       data.tableData= data.tableData.map((item,index1) => {
+          return {
+            ...item,
+            index: index1 +1,
+          };
+        });
+      console.log(data.tableData,56565);
     }
 
     // data.tableData = props.tableData;
@@ -295,7 +300,6 @@ watch(
 watch(
   () => props.tableData,
   (newVal, oldVal) => {
-
     // data.tableData = props.tableData;
     // console.log("状态1", data);
   }
@@ -318,7 +322,6 @@ onMounted(() => {
 //   console.log("状态3", data);
 // });
 
-
 const closeDialog = () => {
   dialogShow.value = false;
   clicked.value = false;