From 1ec8bc5c749c36e2c845ee55740472ca4125193d Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Mon, 21 Mar 2022 10:26:03 +0800
Subject: [PATCH] +

---
 src/views/hd/hd.vue |   67 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/views/hd/hd.vue b/src/views/hd/hd.vue
index 21e9474..b98c56f 100644
--- a/src/views/hd/hd.vue
+++ b/src/views/hd/hd.vue
@@ -20,7 +20,7 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
     >
-      <template slot="menuLeft">
+      <!-- <template slot="menuLeft">
         <el-button
           type="danger"
           size="small"
@@ -30,31 +30,30 @@
           @click="handleDelete"
           >删 除
         </el-button>
-      </template>
+      </template> -->
       <template slot-scope="{ type, disabled }" slot="lineForm">
-        <!-- <div class="mapClassMain" style="width: 100%; height: 400px">
-          <Map ref="modalForm" />
-        </div> -->
-        <getMapData
+        <getMapDataInThere
           ref="getMapData"
           id="getMapData"
           @setMapData="setMapData"
-        ></getMapData>
+        ></getMapDataInThere>
       </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/hd/hd";
-import { mapGetters } from "vuex";
+import {getList, getDetail, add, update, remove} from "@/api/hd/hd";
+import {mapGetters} from "vuex";
 // import Map from "@/components/map/main.vue";
 import getMapData from "./getMapData.vue";
+import getMapDataInThere from "./getMapDataInThere.vue";
 
 export default {
   components: {
     // Map,
     getMapData,
+    getMapDataInThere,
   },
   data() {
     return {
@@ -93,13 +92,14 @@
               },
             ],
           },
-          {
-            label: "活动地点",
-            addDisplay: false,
-            hide: true,
-            editDisply: false,
-            prop: "address",
-          },
+          // {
+          //   label: "活动地点",
+          //   viewDisply:false,
+          //   addDisplay: false,
+          //   hide: true,
+          //   editDisply: false,
+          //   prop: "address",
+          // },
           {
             label: "时间",
             prop: "time",
@@ -128,17 +128,6 @@
             action: "/api/blade-resource/oss/endpoint/put-file",
           },
           {
-            label: "选择路径和标点",
-            labelWidth: "0",
-            prop: "line",
-            className: "mapClass",
-            hide: true,
-            display: true,
-            span: 24,
-            formslot: true,
-            addDisplay: true,
-          },
-          {
             label: "介绍",
             prop: "context",
             component: "AvueUeditor",
@@ -152,8 +141,19 @@
             minRows: 5,
             span: 24,
           },
+          {
+            label: "选择路径和标点",
+            labelWidth: "0",
+            prop: "line",
+            className: "mapClass",
+            hide: true,
+            display: true,
+            span: 24,
+            formslot: true,
+            addDisplay: true,
+          },
           // {
-          //   label: "路线",
+          //   label: "路线",活动
           //   hide: true,
           //   prop: "lx",
           //   editDisply: false,
@@ -212,6 +212,9 @@
       row["lx"] = outMapData[0][1];
       row["addressname"] = outMapData[1][0];
       row["address"] = outMapData[1][1];
+      // console.log(row);
+      // loading();
+      // return;
       add(row).then(
         () => {
           this.onLoad(this.page);
@@ -237,6 +240,9 @@
       row["lx"] = outMapData[0][1];
       row["addressname"] = outMapData[1][0];
       row["address"] = outMapData[1][1];
+      // console.log(row);
+      // loading();
+      // return;
       update(row).then(
         () => {
           this.onLoad(this.page);
@@ -295,6 +301,7 @@
       //  声明定时器
       let that = this;
       var timer = null;
+
       //  检查dom是否执行完成
       function checkDom() {
         let dom = that.$refs[name];
@@ -316,6 +323,7 @@
           timer = setTimeout(checkDom, 100);
         }
       }
+
       //  首次执行
       checkDom();
     },
@@ -385,6 +393,7 @@
 .mapClass {
   margin-left: 88px;
 }
+
 .mapClass div label {
   display: none;
 }
@@ -397,6 +406,6 @@
   width: calc(100% + 90px);
   position: relative;
   left: -90px;
-  height: auto;
+  height: 400px;
 }
 </style>

--
Gitblit v1.9.3