Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/utils/request.js

@@ -3,7 +3,7 @@ import { ElMessage } from "element-plus";
 import tools from "@/utils/tools";
 import router from "../router";
 
-// axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/'
+axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/'
 axios.defaults.timeout = 120000;
 
 // HTTP request 拦截器
@@ -38,7 +38,6 @@ axios.interceptors.response.use(
           const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
           document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;";
         }
-
         router.replace({
           path: "/guide",
         });

src/view/dialog/dialogPush.vue

@@ -44,7 +44,7 @@
           <div style="border: 1px solid #5284b0">
             <el-table
               :data="data.tableData"
-                height='500px'
+              height="500px"
               :header-cell-style="{ background: 'rgba(0, 143, 205, 0.63)' }"
               @row-click="handleRowClick"
               stripe
@@ -57,8 +57,7 @@
                   :width="item.width || ''"
                   :align="item.align || 'center'"
                 >
-                    <template #default="scope">
+                  <template #default="scope"> </template>
-                    </template>
                 </el-table-column>
                 <el-table-column
                   v-else
@@ -127,7 +126,7 @@
     },
   },
 });
-  const emit = defineEmits(["close",'showList']);
+const emit = defineEmits(["close", "showList"]);
 
 const handleRowClick = (row, column, event) => {
   emit("showList", row);
@@ -141,7 +140,6 @@
   tableData: [],
 });
 
-  
 const gridData = [];
 //切换页数后置顶
 // 监听
@@ -149,13 +147,20 @@
   () => props.dialogShow,
   (newVal, oldVal) => {
     dialogShow.value = newVal;
-
   }
 );
 watch(
   () => props.tableData,
   (newVal, oldVal) => {
-        
+    data.tableData = props.tableData;
+    data.tableData = data.tableData.map(item => {
+    if (item.sendTime) {
+      const [date, time] = item.sendTime.split('T'); // 分离日期和时间
+      item.sendTime = `${date} ${time.slice(0, 5)}`; // 只保留时分
+    }
+    return item;
+  });
+    console.log(555, props.tableData);
   }
 );
 
@@ -164,6 +169,7 @@
   dialogShow.value = props.dialogShow;
   data.title = props.title;
   data.columns = props.columns;
+  data.tableData = props.tableData;
 });
 
 const closeDialog = () => {
@@ -384,4 +390,3 @@
   // }
 }
 </style>
-  

src/view/dialog/dialogSf.vue

@@ -49,28 +49,47 @@
           "
         >
           <div class="item">
-            <div class="item_title">概况模型</div>
+            <div class="item_title">
+              <div class="yd_title">
+                <span>概况模型</span>
+                <div class="semi-circle-shadow"></div>
+                <div class="animate-border">
+                  <i></i>
+                  <i></i>
+                </div>
+              </div>
+            </div>
+
             <div class="item_content">{{ data.content.bz }}</div>
           </div>
           <div class="item" style="margin-top: 20px">
-            <div class="item_title">详情描述</div>
+            <div class="item_title">
+              <div class="yd_title">
+                <span>详情描述</span>
+                <div class="semi-circle-shadow"></div>
+                <div class="animate-border">
+                  <i></i>
+                  <i></i>
+                </div>
+              </div>
+            </div>
             <div class="item_content item_contents">
               <div class="item_content_item">
-                <div class="item_content_item_title">输入：</div>
+                <div class="item_content_item_title">输入:</div>
                 <div
                   class="item_content_item_content"
                   v-html="formatContent(data.content.srsj)"
                 ></div>
               </div>
               <div class="item_content_item">
-                <div class="item_content_item_title">对比逻辑：</div>
+                <div class="item_content_item_title">对比逻辑:</div>
                 <div
                   class="item_content_item_content"
                   v-html="formatContent(data.content.bdlj)"
                 ></div>
               </div>
               <div class="item_content_item">
-                <div class="item_content_item_title">输出：</div>
+                <div class="item_content_item_title">输出:</div>
                 <div
                   class="item_content_item_content"
                   v-html="formatContent(data.content.scjg)"
@@ -284,10 +303,15 @@ const handle = (current) => {
       margin-bottom: 20px;
       box-sizing: border-box;
       .item_content_item_title {
+        width: 100px;
+        height: 30px;
+        line-height: 30px;
+        text-align: center;
+        background-color: #3287d2;
         font-weight: 600;
         font-size: 17px;
-        width: 100px;
         margin-right: 10px;
+        padding: 0 8px;
       }
       .item_content_item_content {
         width: calc(100% - 110px);
@@ -304,4 +328,168 @@ const handle = (current) => {
     display: none; /* Chrome Safari */
   }
 }
+.yd_title {
+  box-sizing: border-box;
+  width: 98%;
+  height: 31px;
+  position: relative;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  span {
+    font-size: 23px;
+    font-weight: 500;
+    font-family: titleNore;
+    margin-left: 20px;
+    color: #fff;
+    position: relative;
+    z-index: 1;
+    width: 500px;
+    overflow: hidden; /* 超出一行文字自动隐藏 */
+    text-overflow: ellipsis; /*文字隐藏后添加省略号*/
+    white-space: nowrap;
+  }
+  /* 利用伪元素和两个i元素产生4条线 */
+  .animate-border {
+    position: absolute;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+    &::before,
+    &::after {
+      content: "";
+      position: absolute;
+      width: 100%;
+      height: 2px;
+    }
+    i {
+      position: absolute;
+      display: inline-block;
+      height: 100%;
+      width: 2px;
+    }
+    &::before {
+      top: 0;
+      left: -100%;
+      background-image: linear-gradient(
+        90deg,
+        transparent,
+        #03e9f4,
+        transparent
+      );
+
+      animation: one 4s linear infinite;
+    }
+    i:nth-child(1) {
+      top: -100%;
+      right: 0;
+      background-image: linear-gradient(
+        180deg,
+        transparent,
+        #03e9f4,
+        transparent
+      );
+      /* 动画名称  动画持续时间  动画渲染函数 动画延迟时间 动画执行次数 */
+      animation: two 4s linear 1s infinite;
+    }
+    &::after {
+      bottom: 0;
+      right: -100%;
+      background-image: linear-gradient(
+        -90deg,
+        transparent,
+        #03e9f4,
+        transparent
+      );
+      animation: three 4s linear 2s infinite;
+    }
+    i:nth-child(2) {
+      bottom: -100%;
+      left: 0;
+      background-image: linear-gradient(
+        360deg,
+        transparent,
+        #03e9f4,
+        transparent
+      );
+      animation: four 4s linear 3s infinite;
+    }
+  }
+  .semi-circle-shadow {
+    position: absolute;
+    bottom: -5px;
+    left: -24px;
+    width: 22%;
+    height: 20px;
+    background: radial-gradient(
+      circle,
+      rgba(37, 127, 173, 1) 0%,
+      rgba(37, 127, 173, 0) 70%
+    );
+    border-radius: 50%;
+    z-index: 0;
+  }
+}
+.yd_title::before {
+  content: "";
+  width: 4px;
+  height: 4px;
+  background-color: rgba(0, 229, 255, 1);
+  border-radius: 50%;
+  position: absolute;
+  left: 0;
+  margin-left: 3px;
+  z-index: 2;
+}
+.yd_title::after {
+  content: "";
+  width: 90%;
+  height: 1px;
+  background: linear-gradient(to right, #257fad, rgba(37, 127, 173, 0));
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 0;
+}
+
+@keyframes one {
+  0% {
+    left: -100%;
+  }
+  50%,
+  100% {
+    left: 100%;
+  }
+}
+
+@keyframes two {
+  0% {
+    top: -100%;
+  }
+  50%,
+  100% {
+    top: 100%;
+  }
+}
+
+@keyframes three {
+  0% {
+    right: -100%;
+  }
+  50%,
+  100% {
+    right: 100%;
+  }
+}
+
+@keyframes four {
+  0% {
+    bottom: -100%;
+  }
+  50%,
+  100% {
+    bottom: 100%;
+  }
+}
 </style>

src/view/echart_analyze/rxfx.vue

@@ -32,12 +32,13 @@ const getOption = () => {
   data.option = {
     tooltip: {
       trigger: "axis",
-      formatter: "{b0}<br />{a1}:{c1} <br />{a3}:{c3}",
+      formatter: "{b0}<br />{a1}:{c1}",
+      // formatter: "{b0}<br />{a1}:{c1} <br />{a3}:{c3}",
     },
     legend: {
       data: ["招生数", "报名数"],
       top: "6%",
-      right: "35%",
+      // right: "35%",
       textStyle: {
         fontSize: 16,
         color: "#ffffff",
@@ -125,7 +126,7 @@ const getOption = () => {
         symbolPosition: "end",
         data: data.zss,
         symbol: "diamond",
-        symbolOffset: ["-65%", "-50%"],
+        symbolOffset: ["0%", "-50%"],
         symbolSize: [20, 10],
         itemStyle: {
           borderColor: "#2fffa4",
@@ -160,49 +161,49 @@ const getOption = () => {
           },
         },
       },
-      {
+      // {
-        z: 2,
+      //   z: 2,
-        name: "上部1",
+      //   name: "上部1",
-        type: "pictorialBar",
+      //   type: "pictorialBar",
-        symbolPosition: "end",
+      //   symbolPosition: "end",
-        data: data.bms,
+      //   data: data.bms,
-        symbol: "diamond",
+      //   symbol: "diamond",
-        symbolOffset: ["62%", "-50%"],
+      //   symbolOffset: ["62%", "-50%"],
-        symbolSize: [20, 10],
+      //   symbolSize: [20, 10],
-        itemStyle: {
+      //   itemStyle: {
-          borderColor: "#32ffee",
+      //     borderColor: "#32ffee",
-          color: "rgba(23, 237, 255, 1)",
+      //     color: "rgba(23, 237, 255, 1)",
-        },
+      //   },
-      },
+      // },
-      {
+      // {
-        z: 2,
+      //   z: 2,
-        name: "报名数",
+      //   name: "报名数",
-        type: "bar",
+      //   type: "bar",
-        barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
+      //   barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
-        data: data.bms,
+      //   data: data.bms,
-        barWidth: "30%",
+      //   barWidth: "30%",
-        label: {
+      //   label: {
-          show: true,
+      //     show: true,
-          color: "#ffffff",
+      //     color: "#ffffff",
-          position: "top",
+      //     position: "top",
      
-        },
+      //   },
-        itemStyle: {
+      //   itemStyle: {
-          color: {
+      //     color: {
-            type: "linear",
+      //       type: "linear",
-            x: 0,
+      //       x: 0,
-            x2: 1,
+      //       x2: 1,
-            y: 0,
+      //       y: 0,
-            y2: 0,
+      //       y2: 0,
-            colorStops: [
+      //       colorStops: [
-              { offset: 0, color: "rgba(23, 237, 255, .7)" },
+      //         { offset: 0, color: "rgba(23, 237, 255, .7)" },
-              { offset: 0.5, color: "rgba(23, 237, 255, .7)" },
+      //         { offset: 0.5, color: "rgba(23, 237, 255, .7)" },
-              { offset: 0.5, color: "rgba(23, 237, 255, .3)" },
+      //         { offset: 0.5, color: "rgba(23, 237, 255, .3)" },
-              { offset: 1, color: "rgba(23, 237, 255, .5)" },
+      //         { offset: 1, color: "rgba(23, 237, 255, .5)" },
-            ],
+      //       ],
-          },
+      //     },
-        },
+      //   },
-      },
+      // },
       {
         type: "bar",
         xAxisIndex: 1,

src/view/person/rwTable.vue

@@ -12,10 +12,43 @@
         <div class="line" v-if="chooseTitle == item.id"></div>
       </div>
     </div>
-    <div class="select" v-if="chooseTitle != '1'">
+    <div v-if="chooseTitle == '1'">
+      <el-table
+        :data="data.tableData"
+        stripe
+        border
+        max-height="80vh"
+        style="width: 100%"
+      >
+        <el-table-column prop="index" label="序号" width="50" />
+        <el-table-column prop="xm" label="姓名" width="60" />
+        <el-table-column prop="sfzhm" label="身份证" />
+        <el-table-column prop="jzzh" label="救助证号" />
+        <el-table-column prop="sjhm" label="联系电话" />
+        <el-table-column prop="xzjd" label="乡镇(街道)" />
+        <el-table-column prop="csq" label="村社" />
+        <el-table-column prop="dz" label="地址" />
+        <el-table-column prop="jzrq" label="救助日期" />
+      </el-table>
+      <div class="pagePart">
+        <el-pagination
+          size="small"
+          :pager-count="5"
+          class="mt-4"
+          background
+          layout="prev, pager, next"
+          :page-size="data.pagination.pageSize"
+          :total="data.pagination.total"
+          :current-page="data.pagination.current"
+          @current-change="handlePagination"
+        />
+      </div>
+    </div>
+    <div v-if="chooseTitle == '2'">
+      <div class="select">
         <div class="select_item">
           <el-input
-          v-model="search.name"
+            v-model="search1.name"
             style="width: 100%"
             placeholder="姓名查询"
             clearable
@@ -29,7 +62,7 @@
         <div class="select_item">
           <el-date-picker
             style="width: 100%"
-          v-model="search.date"
+            v-model="search1.date"
             type="date"
             placeholder="选择时间"
             format="YYYY-MM-DD"
@@ -38,11 +71,78 @@
           />
         </div>
       </div>
+      <el-table
+        :data="data.tableData1"
+        stripe
+        border
+        max-height="74vh"
+        style="width: 100%"
+      >
+        <el-table-column prop="index" label="序号" width="50" />
+        <el-table-column prop="ahap0016" label="申请人" width="70" />
+        <el-table-column prop="ahap0015" label="身份证" />
+        <el-table-column prop="ahax0003" label="救助证号" />
+        <el-table-column prop="ahax0004" label="申请救助" />
+        <el-table-column prop="ahax0011" label="银行账号" />
+        <el-table-column prop="azdf0005" label="家庭总人口" width="50" />
+        <el-table-column prop="azdf0011" label="手机号码" />
+        <el-table-column prop="bhax0003" label="用电户号" />
+        <el-table-column prop="bhax0004" label="减免地址" />
+        <el-table-column prop="bhax0005" label="低保类别" />
+        <el-table-column prop="bhax0008" label="致贫原因" />
+        <el-table-column prop="bhax0009" label="是否申请电力减免" />
+        <el-table-column prop="bhax0011" label="水费户号" />
+        <el-table-column prop="bhax0012" label="燃气户号" />
+        <el-table-column prop="bhax0013" label="有线电视户号" />
+        <el-table-column prop="bhax0033" label="救助日期" />
+        <el-table-column prop="bhax0035" label="低保类型" />
+      </el-table>
+      <div class="pagePart">
+        <el-pagination
+          size="small"
+          class="mt-4"
+          background
+          layout="prev, pager, next"
+           :pager-count="5"
+          :page-size="data.pagination1.pageSize"
+          :total="data.pagination1.total"
+          :current-page="data.pagination1.current"
+          @current-change="handlePagination1"
+        />
+      </div>
+    </div>
+    <div v-if="chooseTitle == '3'">
+      <div class="select">
+        <div class="select_item">
+          <el-input
+            v-model="search1.name"
+            style="width: 100%"
+            placeholder="姓名查询"
+            clearable
+            class="input-with-select"
+          >
+            <template #append>
+              <el-button :icon="Search" @click="searchT1('name')" />
+            </template>
+          </el-input>
+        </div>
+        <div class="select_item">
+          <el-date-picker
+            style="width: 100%"
+            v-model="search1.date"
+            type="date"
+            placeholder="选择时间"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            @change="searchT1('date')"
+          />
+        </div>
+      </div>
       <el-table
         :data="data.tableData"
         stripe
         border
-      max-height="100vh"
+        max-height="80vh"
         style="width: 100%"
       >
         <el-table-column prop="index" label="序号" width="50" />
@@ -54,21 +154,37 @@
         <el-table-column prop="csq" label="村社" />
         <el-table-column prop="dz" label="地址" />
         <el-table-column prop="jzrq" label="救助日期" />
-      <!-- <el-table-column prop="nl" label="年龄" width="60" /> -->
-      <!-- <el-table-column prop="bq" label="人口标签" /> -->
       </el-table>
+      <div class="pagePart">
+        <el-pagination
+          size="small"
+          class="mt-4"
+          background
+          layout="prev, pager, next"
+          :page-size="data.pagination.pageSize"
+          :total="data.pagination.total"
+          :current-page="data.pagination.current"
+          @current-change="handlePagination"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup>
 import { onMounted, ref, reactive } from "vue";
 import { useRouter, useRoute } from "vue-router";
+import { ElMessage } from "element-plus";
 import http from "@/utils/request.js";
 import { Search } from "@element-plus/icons-vue";
 const router = useRouter();
 const routers = useRoute();
 const chooseTitle = ref(1);
-const search = reactive({
+const search1 = reactive({
+  name: "",
+  date: "",
+});
+const search2 = reactive({
   name: "",
   date: "",
 });
@@ -88,11 +204,17 @@ const titleList = reactive([
   },
 ]);
 const data = reactive({
+  code: "",
   xh: "",
   bm: "",
   pagination: {
     current: 1,
-    pageSize: 200,
+    pageSize: 20,
+    total: 0,
+  },
+  pagination1: {
+    current: 1,
+    pageSize: 20,
     total: 0,
   },
   columns: [
@@ -121,6 +243,7 @@ const data = reactive({
     },
   ],
   tableData: [],
+  tableData1: [],
 });
 
 //节流
@@ -136,42 +259,115 @@ const throttle = (func, limit) => {
 
 const searchT = (val) => {
   console.log(val);
-
   if (val == "name") {
-    console.log(search);
+    getRegisteredDB();
   } else {
-    if (search.date == null) {
+    if (search1.date == null) {
-      throttle(getDate, 50);
+      search1.date = "";
+      throttle(getRegisteredDB, 50);
     } else {
+      getRegisteredDB();
       console.log(search);
     }
   }
 };
+
+const searchT1 = (val) => {
+  // console.log(val);
+  // if (val == "name") {
+  //   getRegisteredDB();
+  // } else {
+  //   if (search1.date == null) {
+  //     throttle(getDate, 50);
+  //   } else {
+  //     console.log(search);
+  //   }
+  // }
+};
 const onTypel = (val) => {
-  console.log("选择",val);
   chooseTitle.value = val.id;
   if (val.id == 1) {
-    
+    personDetails();
-  }else{
+  } else if (val.id == 2) {
-    data.tableData = []
+    data.tableData = [];
+    getRegisteredDB();
+  } else if (val.id == 3) {
+    data.tableData = [];
   }
 };
 const getDate = () => {
   console.log("未选择时间");
 };
-const personDetails = () => {
+
-  http.get(`/api/ggfwyth/pg/wxsbmRyxx/${data.xh}/${data.bm}`).then((res) => {
+const getRegisteredDB = () => {
+  http
+    .get(
+      `/api/ggfwyth/pg/zcdbry?size=${data.pagination1.pageSize}&page=${data.pagination1.current}&name=${search1.name}&jzrq=${search1.date}`
+    )
+    .then((res) => {
       if (res.code == 200) {
         // console.log(res.data);
-      data.tableData = res.data;
+        data.tableData1 = res.data;
+        data.pagination1.total = res.count;
+        const currentPage = data.pagination1.current; // 当前页数
+        const pageSize = data.pagination1.pageSize; // 每页显示的条数
+
+        data.tableData1 = res.data.map((item) => {
+          // 提取 bhax0033 中的日期部分
+          if (item.bhax0033) {
+            item.bhax0033 = item.bhax0033.split("T")[0]; // 截取日期部分
+          }
+          return item;
+        });
+        // 为每条数据添加 index 属性，叠加当前页的偏移量
+        res.data.forEach((item, index) => {
+          item.index = index + 1 + (currentPage - 1) * pageSize;
+        });
       } else {
         ElMessage.warning({
           message: res.message,
         });
+        router.replace({
+          path: "/error/403",
+        });
       }
     });
 };
+const personDetails = () => {
+  http
+    .get(
+      `/api/ggfwyth/pg/wxsbmRyxx/${data.xh}/${data.bm}?size=${data.pagination.pageSize}&page=${data.pagination.current}`
+    )
+    .then((res) => {
+      if (res.code == 200) {
+        // console.log(res.data);
+        data.tableData = res.data;
+        data.pagination.total = res.count;
 
+        const currentPage = data.pagination.current; // 当前页数
+        const pageSize = data.pagination.pageSize; // 每页显示的条数
+        // 为每条数据添加 index 属性，叠加当前页的偏移量
+        res.data.forEach((item, index) => {
+          item.index = index + 1 + (currentPage - 1) * pageSize;
+        });
+      } else {
+        ElMessage.warning({
+          message: res.message,
+        });
+        router.replace({
+          path: "/error/403",
+        });
+      }
+    });
+};
+const handlePagination = (currentPage) => {
+  data.pagination.current = currentPage;
+  personDetails();
+};
+const handlePagination1 = (currentPage) => {
+  data.pagination1.current = currentPage;
+  getRegisteredDB();
+};
 onMounted(() => {
   //   data.tableData = JSON.parse(routers.query.personDetails);
   data.xh = routers.query.xh;
@@ -228,6 +424,13 @@ onMounted(() => {
     }
   }
 }
+.pagePart {
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 8px;
+}
 :deep(.el-input-group__append button.el-button) {
   background-color: #0091ff;
   color: #fff;

src/view/sy_details.vue

@@ -448,7 +448,7 @@ const push = reactive({
   columns: [
     {
       label: "序号",
-      property: "xm",
+      property: "index",
       width: "90",
     },
     {

src/view/table_gk/gk_jz.vue

@@ -721,6 +721,8 @@ onMounted(() => {});
   margin-top: 40px;
   display: flex;
   justify-content: space-around;
+  // position: absolute;
+
   &_item {
     width: 45%;
     display: flex;

vite.config.js

@@ -15,8 +15,8 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        target: "http://10.0.0.7:8095/", //刘进
+        // target: "http://10.0.0.7:8095/", //刘进
-        // target: "https://jzzf.longyou.gov.cn:998/", //线上
+        target: "https://jzzf.longyou.gov.cn:998/", //线上
         // target: "http://220.191.238.50:996/", //线上
         // target: "https://zzdyyfb.dsjj.qz.gov.cn/web/mgop/gov-open/zj/2002428903/reserved/", //线上
         changeOrigin: true, //是否支持跨域