gx

src/view/analyze.vue

@@ -1023,6 +1023,7 @@ const getData = async () => {
       
     }
   });
+  //调用借助页面的接口
   await http.get("/api/ggfwyth/succour").then((res) => {
     if (res.code == 200) {
       data.dataAnalysis.forEach((item,index)=>{
@@ -1055,7 +1056,6 @@ const getData = async () => {
         data.dataAnalysis[5].data.push(item.jzrs);
       });
     }
-    jz.value = '1';
     data.list = data.dataAnalysis[0];
   });
      showEchart.value = true;

src/view/dialog/dialogRW.vue

@@ -48,16 +48,23 @@
             <div class="status">
               <span>状态：</span>
               <el-popconfirm
-                hide-icon="false"
-                cancel-button-text="取消"
-                confirm-button-text="上报"
                 title="确定要上报吗?"
-                @cancel="cancelEvent"
-                @confirm="confirmEvent"
+                hide-icon="true"
+                @cancel="onCancel"
               >
                 <template #reference>
                   <img :src="lampImages[data.character.zt]" />
                 </template>
+                <template #actions="{ confirm, cancel }">
+                  <el-button size="small" @click="cancel">取消11</el-button>
+                  <el-button
+                    type="danger"
+                    size="small"
+                    @click="confirm"
+                  >
+                    上报
+                  </el-button>
+                </template>
               </el-popconfirm>
             </div>
           </div>
@@ -197,10 +204,14 @@ const handleRowClick = (row, column, event) => {
   }
 };
 // 上报
+const clicked = ref(false)
+const onCancel = () =>{
+  clicked.value = true
+}
 const confirmEvent = () => {
   console.log("confirm!");
 };
-const cancelEvent = () => {
+const cancel = () => {
   console.log("cancel!");
 };
 
@@ -331,6 +342,7 @@ const handle = (current) => {
     border: none;
     --el-table-text-color: #fff;
     --el-table-header-text-color: #fff;
+    --el-table-border-color: none !important;
   }
 
   // :deep(.el-table th) {
@@ -402,30 +414,4 @@ const handle = (current) => {
     height: 19px;
   }
 }
-.el-popper.is-light .el-popper__arrow:before {
-  right: -60px;
-}
-:deep(.el-popover.el-popper) {
-  transform: translate(1034px, 291px) !important;
-}
-.table-els {
-  :deep(.el-table) {
-    background: rgba(32, 64, 115, 1);
-
-    --el-table-border-color: none;
-    border: 1px solid #7aceff;
-  }
-
-  :deep(.el-table--enable-row-hover .el-table__body tr:hover > td) {
-    background-color: #2f4b74;
-  }
-
-  :deep(.el-table__empty-block) {
-    background-color: #122560;
-  }
-
-  :deep(.el-table .el-table__row) {
-    border-bottom: none;
-  }
-}
 </style>

src/view/sy_details.vue

@@ -2956,23 +2956,23 @@ onMounted(() => {
 <style lang="scss" scoped>
 // 表格
 :deep(.el-table) {
-  background: rgba(32, 64, 115, 1) !important ;
+  background: rgba(32, 64, 115, 1)  ;
   color: #ffffff;
   --el-table-tr-bg-color: none;
   --el-table-header-bg-color: none;
   --el-table-header-text-color: none;
-  border: 1px solid #7aceff;
-}
-.table {
-  :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
-    border: none !important;
-    padding-left: 10px !important;
-    text-align: center;
-  }
-}
-:deep(.el-table td.el-table__cell) {
-  padding: 13px 0px;
+  // border: 1px solid #7aceff;
 }
+// .table {
+//   :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
+//     border: none !important;
+//     padding-left: 10px !important;
+//     text-align: center;
+//   }
+// }
+// :deep(.el-table td.el-table__cell) {
+//   padding: 13px 0px;
+// }
 
 :deep(.el-table--enable-row-hover .el-table__body tr:hover > td) {
   background-color: #2f4b74;

src/view/sy_map_fb.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="module">
     <teleport to="body">
-      <div id="map" style="width: 100vw; height: 100vh" v-show="!openD"></div>
+      <div id="map" style="width: 100vw; height: 100vh" ></div>
       <div class="btns" v-if="showEdit">
         <div
           class="btnopen"
@@ -80,7 +80,7 @@
       </div>
       <div
         class="btnBj"
-        v-if="!showEdit && !dialogShow && !openD && !showEdit2"
+        v-if="!showEdit && !dialogShow && !showEdit2"
         @click="openqx()"
       >
         地图权限：
@@ -210,12 +210,6 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import tools from "@/utils/tools";
 import http from "@/utils/request.js";
 import dwd from "@/assets/images/map/dwd.png";
-import b1 from "@/assets/images/map/bb1.png";
-import b2 from "@/assets/images/map/b2.png";
-import b3 from "@/assets/images/map/b3.png";
-import b4 from "@/assets/images/map/b4.png";
-import b5 from "@/assets/images/map/b5.png";
-import b6 from "@/assets/images/map/b6.png";
 import xcbg from "@/assets/images/map/xcbg.png";
 import AED from "@/assets/images/map/AED.png";
 // import gcj02towgs84 from "@/utils/gcj02towgs84.js";