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

src/components/header.vue

@@ -1,9 +1,6 @@
 <template>
   <teleport to="body">
-    <div
-      class="header_content"
-      style="position: absolute; z-index: 9999; width: 1920px"
-    >
+    <div class="header_content">
       <div class="header">
         <div class="headerGo" @click="to('/guide')"></div>
         <!-- <img class="title" src="../assets/img_07.png" alt="" /> -->
@@ -11,6 +8,14 @@
           <div id="date-display"></div>
           <div id="clock" style="margin-top: 4px">加载中...</div>
         </div>
+        <div
+          class="back"
+          @click="back()"
+          v-if="routers.path == '/home/index/table/details'"
+        >
+          <img src="@/assets/person/back.png" alt="" />
+          <p>返回</p>
+        </div>
         <div class="header-menu">
           <div class="header-menu-item header-menu-left">
             <div
@@ -59,6 +64,12 @@
 <script setup>
 import { ref, reactive, toRefs, onMounted, inject, nextTick, watch } from "vue";
 import { useRouter, useRoute } from "vue-router";
+const router = useRouter();
+const routers = useRoute();
+// 返回
+const back = () => {
+  router.back();
+};
 const updateClock = () => {
   //获取当前时间
   const now = new Date();
@@ -103,8 +114,7 @@ const onMenu = (val) => {
   data.nowTab = val.url;
   data.menushow = false;
 };
-const router = useRouter();
-const routers = useRoute();
+
 let menuIf = ref(true);
 const data = reactive({
   menushow: false,
@@ -373,6 +383,38 @@ onMounted(() => {
 }
 
 .header_content {
+  position: absolute;
+  z-index: 999;
+  width: 1920px;
+  // background-color: rgba(17, 44, 78, 0.9);
   background: url("../assets/bgImg.png") no-repeat 0/100% 100%;
 }
+.back {
+  box-sizing: border-box;
+  position: fixed;
+  width: 88px;
+  height: 36px;
+  top: 90px;
+  left: 45px;
+  background: url("../../assets/person/back_bg.png") no-repeat;
+  background-size: 100% 100%;
+  background-color: #0d4378;
+  border-radius: 36px;
+  display: flex;
+  align-items: center;
+  padding: 10px 16px;
+  z-index: 10000;
+  cursor: pointer;
+  img {
+    width: 17px;
+    height: 16px;
+  }
+  p {
+    margin-left: 5px;
+    font-weight: 400;
+    font-size: 16px;
+    color: #b5eaff;
+    line-height: 22px;
+  }
+}
 </style>

src/view/home.vue

@@ -5,9 +5,8 @@
           <img class="title" src="../assets/img_07.png" alt="" />
         </div> -->
       <Header />
-  
-        <router-view />
 
+      <router-view />
     </div>
   </div>
 </template>
@@ -72,7 +71,6 @@ window.addEventListener("resize", function () {
   padding: 0;
   margin: 0;
   box-sizing: border-box;
-  // color: #ccffff;
 }
 
 html {

src/view/sy_details.vue

@@ -1613,7 +1613,10 @@ const listAssignment = () => {
       break;
   }
 };
-
+// 返回
+const back = () => {
+  router.back();
+};
 onMounted(() => {
   // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   if (routers.query.name) {
@@ -1622,7 +1625,6 @@ onMounted(() => {
   }
 });
 </script>
-
 <style lang="scss" scoped>
 .module {
   width: 100%;
@@ -1632,6 +1634,7 @@ onMounted(() => {
   justify-content: space-between;
   padding: 10px 45px;
   box-sizing: border-box;
+ 
   .displayFlex {
     height: 100%;
     display: flex;

src/view/sy_map.vue

@@ -980,7 +980,7 @@ const csName = async () => {
     .then((res) => {
       if (res.code == 200) {
         ElMessage.success({
-          message: "修改村名成功"
+          message: "修改村名成功",
         });
       }
     });