From 147c83091776832ee9623a02f6fcea0b3bc5cec9 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Fri, 13 Sep 2024 10:25:46 +0800
Subject: [PATCH 1/3] 11

---
 src/view/dialog/dialogRW.vue | 27 ++++++++++++++++++++-------
 src/view/sy_details.vue      |  2 +-
 src/view/sy_table.vue        |  2 +-
 vite.config.js               |  4 ++--
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index 0a4f035..908bc29 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -68,7 +68,6 @@
             <template v-for="item in data.columns" :key="item.label">
               <el-table-column
                 v-if="item.type === 'slot'"
-               
                 :label="item.label"
                 :property="item.property"
                 :width="item.width || ''"
@@ -145,7 +144,7 @@ import lamp7 from "../../assets/sy-table/lampGreen3.png";
 import lamp8 from "../../assets/sy-table/lampRed3.png";
 import lamp9 from "../../assets/sy-table/lampYellow3.png";
 import { ElMessage } from "element-plus";
-
+import http from "@/utils/request.js";
 const router = useRouter();
 const routers = useRoute();
 
@@ -206,12 +205,26 @@ const escalation = () => {
   console.log(clicked.value);
 };
 const confirmEvent = () => {
-  console.log("confirm!");
-  ElMessage.success({
-    message: `上报成功`,
-    offset: 100, // 距离窗口顶部的偏移量
+  console.log("confirm!", data.character);
+  let ReportedDto = {
+    name: data.character.xm,
+    address: data.character.dz,
+    phone: "",
+    type: "ggdw_mz_db",
+  };
+  http.post(`/api/ggfwyth/pg/reported`, ReportedDto).then((res) => {
+    if (res.code == 200) {
+      ElMessage.success({
+        message: `上报成功`,
+      });
+      clicked.value = false;
+    }else{
+      ElMessage.error({
+        message: res.message,
+      });
+      clicked.value = false;
+    }
   });
-  clicked.value = false;
 };
 const cancelEvent = () => {
   clicked.value = false;
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index 21a5fac..9d57aaf 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -2666,7 +2666,7 @@ const updateFormDataAndTable = (formDataName, tableData) => {
   data.column_2 = tableData.column_2;
   data.tableData = tableData.tableData1; //列表1
   data.tableData1 = tableData.tableData2; //列表2
-  data.tableData3 = tableData.tableData3; //列表3 状态假数据
+  data.tableData3 = tableData.tableData3; //列表3 状态假数据(全部未筛选)
   pagination1.total = tableData.tableData2.length;
   handlePagination1(1);
   if (formDataName == "低保") {
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index a87c60c..faf231d 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -678,7 +678,7 @@ const sevenYX = (name) => {
 onMounted(() => {
   tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
 
-  if (localStorage.getItem("taps1") !== undefined) {
+  if (localStorage.getItem("taps1")) {
     data.tapbody = JSON.parse(localStorage.getItem("taps1"));
     data.taps = localStorage.getItem("taps");
     data.taps1 = data.tapbody.id;
diff --git a/vite.config.js b/vite.config.js
index 99753df..7708875 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -15,8 +15,8 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        // target: "http://10.0.0.65:8095/", //刘进
-        target: "http://220.191.238.50:996/", //线上
+        target: "http://10.0.0.65:8095/", //刘进
+        // target: "http://220.191.238.50:996/", //线上
         changeOrigin: true, //是否支持跨域
         //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
       },

From efd3a500e67bf03e1426cc7f11831decec52b899 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Fri, 13 Sep 2024 10:55:08 +0800
Subject: [PATCH 2/3] 1

---
 src/view/dialog/dialogRW.vue | 16 +++++++++++++++-
 src/view/sy_table.vue        |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index 908bc29..ff5f2e7 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -50,6 +50,7 @@
               <img :src="lampImages[data.character.zt]" @click="escalation" />
               <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>
@@ -145,6 +146,7 @@ import lamp8 from "../../assets/sy-table/lampRed3.png";
 import lamp9 from "../../assets/sy-table/lampYellow3.png";
 import { ElMessage } from "element-plus";
 import http from "@/utils/request.js";
+import { reRendering } from "element-plus/es/components/watermark/src/utils.mjs";
 const router = useRouter();
 const routers = useRoute();
 
@@ -204,6 +206,7 @@ const escalation = () => {
   }
   console.log(clicked.value);
 };
+
 const confirmEvent = () => {
   console.log("confirm!", data.character);
   let ReportedDto = {
@@ -363,7 +366,7 @@ const handle = (current) => {
         .lampTitle {
           text-align: center;
           // padding-top: 33px;
-          margin: 33px 0 30px 0;
+          margin: 28px 0 10px 0;
           font-size: 16px;
           font-weight: 500;
           font-family: PingFangSC, PingFang SC;
@@ -371,6 +374,17 @@ 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;
+          color: red;
+          line-height: 22px;
+          letter-spacing: 1px;
+        }
         .lampBtn {
           display: flex;
           align-items: center;
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index faf231d..652640d 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -136,7 +136,7 @@
                   class="progress-bar"
                   :style="{ width: item.progress + '%' }"
                 >
-                  <span>{{ item.progress }}%</span>
+                  <!-- <span>{{ item.progress }}%</span> -->
                 </div>
               </div>
             </div>

From 5f6379ba8016790a4177d9d4e95bf823a4787bd4 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Fri, 13 Sep 2024 11:40:15 +0800
Subject: [PATCH 3/3] 111

---
 src/view/dialog/dialogRW.vue |  2 +-
 src/view/sy_details.vue      |  9 +++++----
 src/view/sy_map.vue          |  2 +-
 src/view/sy_table.vue        | 22 +++++++++++-----------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index ff5f2e7..a340dd6 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -213,7 +213,7 @@ const confirmEvent = () => {
     name: data.character.xm,
     address: data.character.dz,
     phone: "",
-    type: "ggdw_mz_db",
+    type: data.character.id,
   };
   http.post(`/api/ggfwyth/pg/reported`, ReportedDto).then((res) => {
     if (res.code == 200) {
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index 9d57aaf..f61c378 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -304,10 +304,10 @@ const router = useRouter();
 const routers = useRoute();
 const data = reactive({
   name: "",
-  identNo: "",//人物ID
-  first: 1,//随访记录&体检记录切换
-  tabelshow: true,//老年人福利补贴切换
-  pagedData: [],//服务内容清单(中间)临时分页数据
+  identNo: "", //人物ID
+  first: 1, //随访记录&体检记录切换
+  tabelshow: true, //老年人福利补贴切换
+  pagedData: [], //服务内容清单(中间)临时分页数据
   columns: [],
   column_1: [],
   column_2: [],
@@ -2422,6 +2422,7 @@ const statusDetails = (val) => {
         tableType.character = {
           ...val,
           age: val.nl,
+          id: routers.query.id,
           // dz: val.address,
           titleName: formData.name,
         };
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index 41b64cb..9528ce4 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -4057,7 +4057,7 @@ const reset_font2 = () => {
     "scale(" + width / 1920 + "," + height / 1080 + ")";
 };
 onMounted(async () => {
-  //  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); 
+   tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); 
   loadingss.value = true;
   reset_font();
   await getXzsj();
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index 652640d..7805f5d 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -196,7 +196,7 @@ const goto = (val) => {
   if (availableRoutes.includes(val.name)) {
     router.push({
       path: "/home/index/table/details",
-      query: { name: val.name },
+      query: { name: val.name, id: val.id },
     });
   } else {
     ElMessage.warning({
@@ -640,7 +640,7 @@ const getData = async (name, fullName) => {
           res.data.forEach((item, index) => {
             const imageIndex = index % data.Bj.length;
             data.tabPublicService.push({
-              id: index,
+              id: item.id,
               Bj: data.Bj[imageIndex],
               name: item.sx,
               text: item.bmfxqk,
@@ -979,16 +979,16 @@ onMounted(() => {
 }
 </style>
 <style lang="scss" scoped>
-.tab{
+.tab {
   :deep(.el-table) {
-  background: rgba(32, 64, 115, 1);
-  color: #ffffff;
-  --el-table-border-color: rgba(57, 107, 161);
-  --el-table-tr-bg-color: none;
-  --el-table-header-bg-color: none;
-  --el-table-header-text-color: none;
-  border: 1px solid #7aceff;
-}
+    background: rgba(32, 64, 115, 1);
+    color: #ffffff;
+    --el-table-border-color: rgba(57, 107, 161);
+    --el-table-tr-bg-color: none;
+    --el-table-header-bg-color: none;
+    --el-table-header-text-color: none;
+    border: 1px solid #7aceff;
+  }
 }
 
 // :deep(.el-table tr) {