1. 完成

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/attractionInfoForm.vue

@@ -1,261 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">取消</el-button>
-      <el-button
-        type="primary"
-        @click="submitForm"
-        v-loading="loading"
-        element-loading-text="提交中..."
-        element-loading-spinner="el-icon-loading"
-        element-loading-background="rgba(0, 0, 0, 0.8)"
-      > 
-        {{ loading ? '提交中...' : '保存' }}
-      </el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "",
-      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        add: '/merchant/merchantSysuser', // 新增地址
-        details: '/merchant/merchantSysuser/', // 详情地址
-        edit: '/merchant/merchantSysuser', // 编辑地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='ADD') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='EDIT') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='EDITInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-      this.$nextTick(()=>{
-        if(this.$refs["form"]) {
-          this.$refs["form"].clearValidate();
-        }
-      })
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 保存
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.model != 'ADD') {
-            updateTableApi(
-              this.configUrl.edit,this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.loading = false
-              this.open = false;
-              this.$emit('refresh')
-            }).catch(()=>{
-              this.$message.error("修改失败!!!");
-              this.loading = false
-            })
-          } else {
-            addTableApi(this.configUrl.edit,this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.loading = false
-              this.open = false;
-              this.$emit('refresh')
-            }).catch(()=>{
-              this.$message.error("新增失败!!!");
-              this.loading = false
-            })
-          }
-        }
-      });
-    },
-    /**
-     * 重置
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    reset() {
-      if(this.$refs["form"]) {
-        this.$refs["form"].clearValidate();
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.reset();
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/pointTypeForm.vue

@@ -67,18 +67,13 @@
 import { 
   getTableDeatilsByIdApi,
   updateTableApi,
-  addTableApi
+  addTableApi,
+  listTableApi
  } from '@/api/CURD'
-import { quillEditor } from 'vue-quill-editor'
- 
-import 'quill/dist/quill.core.css'
-import 'quill/dist/quill.snow.css'
-import 'quill/dist/quill.bubble.css'
 
 export default {
   name: "addAndEdit",
-  dicts: ['tourism_online_status','tourism_online_type'],
-  components: {quillEditor},
+  dicts: [],
   data() {
     return {
       title: "",
@@ -96,9 +91,6 @@ export default {
       },
       rules: {
         name: [{ required: true, message: "请输入类型名称", trigger: ["change","blur"] }],
-        type: [{ required: true, message: "请选择类型", trigger: ["change","blur"] }],
-        backgroundColor: [{ required: true, message: "请选择banner背景色值", trigger: ["change","blur"] }],
-        detail: [{ required: true, message: "请输入内容", trigger: ["change","blur"] }],
         iconImg: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
@@ -240,25 +232,6 @@ export default {
       this.reset();
       this.open = false;
     },
-    // 失去焦点事件
-    onEditorBlur(quill) {
-      console.log('editor blur!', quill)
-    },
-    // 获得焦点事件
-    onEditorFocus(quill) {
-      console.log('editor focus!', quill)
-    },
-    // 准备富文本编辑器
-    onEditorReady(quill) {
-      console.log('editor ready!', quill)
-    },
-    // 内容改变事件
-    onEditorChange({ quill, html, text }) {
-      console.log('editor change!', quill, html, text)
-      this.form.detail = html
-    },
-
-
     /**  上传图片  */
     handleAvatarSuccess(res, file) {
       console.log("res, file",res, file)

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/attractionInfoManagementForm.vue

@@ -13,58 +13,32 @@
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        <div class="form-title"><span>基本信息</span></div>
-        <el-form-item label="景区名称：" prop="name">
-          <el-input style="width: 350px;" v-model="form.name" placeholder="请输入景区名称" maxlength="20" show-word-limit />
+        <el-form-item label="点位名称：" prop="name">
+          <el-input style="width: 350px;" v-model="form.name" placeholder="请输入点位名称" maxlength="20" show-word-limit />
         </el-form-item>
-        <el-form-item label="开放时间：" prop="openDate">
-          <el-time-picker
-            is-range
-            v-model="form.openDate"
-            value-format="HH:mm"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            placeholder="选择开/闭园时间范围">
-          </el-time-picker>
-        </el-form-item>
-        <el-form-item label="景点产品：" prop="goodId">
-          <el-select v-model="form.goodId" placeholder="请选择景点产品">
+        <el-form-item label="点位类型：" prop="typeId">
+          <el-select v-model="form.typeId" placeholder="请选择点位类型">
             <el-option
-              v-for="item in scenicAreaProducts"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              v-for="item in pointTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开/闭园：" prop="openDate">
-          <el-switch
-              style="display: block;margin-top: 5px;"
-              v-model="form.status"
-              active-color="#13ce66"
-              inactive-color="#ccc"
-              active-text="开"
-              inactive-text="关"
-              :active-value="2"
-              :inactive-value="1"
-              >
-            </el-switch>
-          
-        </el-form-item>
-        <div class="form-title"><span>宣推资料</span></div>
-        <el-form-item label="内容详情：" prop="content">
+        <el-form-item label="地图定位：">
+          <div style="display: flex;">
+            <el-form-item label="经度：" label-width="80px" prop="longitude">
+              <el-input style="width: 350px;" v-model="form.longitude" placeholder="请输入点位名称" />
+            </el-form-item>
+            <el-form-item label="纬度：" prop="latitude">
+              <el-input style="width: 350px;" v-model="form.latitude" placeholder="请输入点位名称" />
+            </el-form-item>
+          </div>
         </el-form-item>
-        <div style="padding-left: 30px;">
-          <quill-editor
-              v-model="form.content"
-              ref="myQuillEditor"
-              :options="editorOption"
-              @blur="onEditorBlur($event)"
-              @focus="onEditorFocus($event)"
-              @change="onEditorChange($event)"
-              @ready="onEditorReady($event)">
-          </quill-editor>
+        <!-- 腾讯地图  -->
+        <div>
+
         </div>
       </el-form>
     </div>
@@ -89,72 +63,48 @@
 import { 
   getTableDeatilsByIdApi,
   updateTableApi,
-  addTableApi
+  addTableApi,
+  listTableApi
  } from '@/api/CURD'
-import { quillEditor } from 'vue-quill-editor'
- 
-import 'quill/dist/quill.core.css'
-import 'quill/dist/quill.snow.css'
-import 'quill/dist/quill.bubble.css'
- 
 
 export default {
   name: "addAndEdit",
   dicts: [],
-  components: {
-    quillEditor
-  },
   data() {
     return {
       title: "",
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/merchantPoints/insertOrUpdate', // 新增地址
-        details: '/merchant/merchantPoints/selectById', // 详情地址
-        edit: '/merchant/merchantPoints/insertOrUpdate', // 编辑地址
+        add: '/merchant/merchantMapMark/insertOrUpdate', // 新增地址
+        details: '', // 详情地址
+        edit: '/merchant/merchantMapMark/insertOrUpdate', // 编辑地址
+        pointTypeList: '/merchant/merchantMapMarkType/list'
       },
       form: {
         id: undefined,
       },
       rules: {
-        name: [{ required: true, message: "请输入景区名称", trigger: ["change","blur"] }],
-        openDate: [{ required: true, message: "请输入景区名称", trigger: ["change","blur"] }],
-        goodId: [{ required: false, message: "请输入景点产品", trigger: ["change","blur"] }],
-        status: [{ required: true, message: "请输入开放状态", trigger: ["change","blur"] }],
+        name: [{ required: true, message: "请输入点位名称", trigger: ["change","blur"] }],
+        typeId: [{ required: true, message: "请选中点位类型", trigger: ["change","blur"] }],
+        longitude: [{ required: false, message: "请输入经度", trigger: ["change","blur"] }],
+        latitude: [{ required: true, message: "请输入纬度", trigger: ["change","blur"] }],
         content: [{ required: true, message: "请输入开放状态", trigger: ["change","blur"] }],
       },
-      scenicAreaProducts: [],// 景点产品关联
-      // 富文本编辑器配置
-      editorOption: {
-        modules: {
-          toolbar: [
-            ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
-            ['blockquote', 'code-block'], // 引用  代码块
-            [{ header: 1 }, { header: 2 }], // 1、2 级标题
-            [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
-            [{ script: 'sub' }, { script: 'super' }], // 上标/下标
-            [{ indent: '-1' }, { indent: '+1' }], // 缩进
-            [{ direction: 'rtl' }], // 文本方向
-            [{ size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36'] }], // 字体大小
-            [{ header: [1, 2, 3, 4, 5, 6] }], // 标题
-            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
-            // [{ font: ['songti'] }], // 字体种类
-            [{ align: [] }], // 对齐方式
-            ['clean'], // 清除文本格式
-            ['image', 'video'] // 链接、图片、视频
-          ]
-        },
-        placeholder: '请输入正文'
-      },
+      pointTypeList: [],// 景点产品关联
     };
   },
+  created() {
+    this.getPointList()
+  },
   methods: {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -214,6 +164,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.loading = true
+          this.loadingText = "提交数据中..."
           if (this.model != 'ADD') {
             addTableApi(
               this.configUrl.edit,{
@@ -264,22 +215,20 @@ export default {
       this.reset();
       this.open = false;
     },
-    // 失去焦点事件
-    onEditorBlur(quill) {
-      console.log('editor blur!', quill)
-    },
-    // 获得焦点事件
-    onEditorFocus(quill) {
-      console.log('editor focus!', quill)
-    },
-    // 准备富文本编辑器
-    onEditorReady(quill) {
-      console.log('editor ready!', quill)
-    },
-    // 内容改变事件
-    onEditorChange({ quill, html, text }) {
-      console.log('editor change!', quill, html, text)
-      this.form.content = html
+    /** 查询用户列表 */
+    getPointList() {
+      listTableApi(
+        this.configUrl.pointTypeList,
+        {
+          pageSize: 999,
+          pageNum: 1
+        }).then(response => {
+            this.pointTypeList = response.data.rows;
+        }
+      ).catch (error=>{
+        console.error('获取点位类型失败!!!!',error)
+        this.pointTypeList = [];
+      }) 
     },
   },
 };

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/scenicGuideImageForm.vue

@@ -0,0 +1,421 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="70%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    element-loading-text="拼命加载数据中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+        <el-form-item label="上传手绘地图" prop="imgUrl">
+          <div
+          style="width: 120px;"
+          v-loading="actionUrlLoading"
+          element-loading-text="上传中..."
+          element-loading-spinner="el-icon-loading"
+          element-loading-background="rgba(0, 0, 0, 0.8)"
+          >
+            <el-upload
+              class="avatar-uploader"
+              :action="actionUrl"
+              :data="{
+                bucket: 'tourism'
+              }"
+              :show-file-list="false"
+              accept=".jpg, .png, jpeg"
+              :on-success="handleAvatarSuccess"
+              :on-progress="handleAvatarProgress"
+              :before-upload="beforeAvatarUpload"
+              :disabled="actionUrlLoading"
+              :on-error="handleAvatarError"
+              >
+              <img v-if="form.imgUrl" style="width: 300px;height: 300px;" :src="form.imgUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+          <span>支持扩展名：jpg、png,大小限定≤3MB图片</span>
+        </el-form-item>
+        <el-form-item label="定位">
+          <el-form-item label="左下角" label-width="100px">
+            <div style="display: flex;">
+              <el-form-item label="经度" label-width="80px" prop="leftLongitude">
+                <el-input style="width: 350px;" v-model="form.leftLongitude" placeholder="请输入左下角经度" />
+              </el-form-item>
+              <el-form-item label="纬度" prop="leftLatitude">
+                <el-input style="width: 350px;" v-model="form.leftLatitude" placeholder="请输入左下角纬度" />
+              </el-form-item>
+            </div>
+          </el-form-item>
+          
+          <el-form-item label="右下角" style="margin-top: 20px;" label-width="100px">
+            <div style="display: flex;">
+              <el-form-item label="经度" label-width="80px" prop="rightLongitude">
+                <el-input style="width: 350px;" v-model="form.rightLongitude" placeholder="请输入右下角经度" />
+              </el-form-item>
+              <el-form-item label="纬度" prop="rightLatitude">
+                <el-input style="width: 350px;" v-model="form.rightLatitude" placeholder="请输入右下角纬度" />
+              </el-form-item>
+            </div>
+          </el-form-item>
+        </el-form-item>
+        <el-form-item label="可见级别" >
+          <div style="display: flex;">
+            <el-form-item label="最小" prop="minNum">
+              <el-input style="width: 350px;" v-model="form.minNum" placeholder="请输入最小可见级别" />
+            </el-form-item>
+            <el-form-item label="最大" prop="maxNum">
+              <el-input style="width: 350px;" v-model="form.maxNum" placeholder="请输入最大可见级别" />
+            </el-form-item>
+          </div>
+          <span>(控制小程序景点导览中手绘地图在哪一级别显示，显示区间10-20调节)</span>
+        </el-form-item>
+        
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
+        {{ loading ? '提交中...' : '保存' }}
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+import { quillEditor } from 'vue-quill-editor'
+ 
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_online_status','tourism_online_type'],
+  components: {quillEditor},
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantMap/save', // 新增地址
+        details: '/merchant/merchantMap/info', // 详情地址
+        edit: '/merchant/merchantMap/save', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        imgUrl: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
+        leftLongitude: [{ required: true, message: "请输入左下角经度", trigger: ["change","blur"] }],
+        leftLatitude: [{ required: true, message: "请输入左下角纬度", trigger: ["change","blur"] }],
+        rightLongitude: [{ required: true, message: "请输入右下角经度", trigger: ["change","blur"] }],
+        rightLatitude: [{ required: true, message: "请输入右下角纬度", trigger: ["change","blur"] }],
+        minNum: [{ required: true, message: "请输入最小可见级别", trigger: ["change","blur"] }],
+        maxNum: [{ required: true, message: "请输入最大可见级别", trigger: ["change","blur"] }],
+      },
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loading = true
+      this.actionUrlLoading = false
+      this.model = model
+      this.formStatus = 0
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',row)
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
+        if(res.code == 200) {
+          let obj = {
+          ...res.data
+        }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("新增失败!!!");
+              this.loading = false
+            })
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /**  上传图片  */
+    handleAvatarSuccess(res, file) {
+      console.log("res, file",res, file)
+      this.actionUrlLoading = false
+      if(res.code != 200) {
+        this.$set(this.form,'imgUrl',null) 
+      }else {
+        this.$set(this.form,'imgUrl',res.data.url) 
+      }
+      
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 <= 3;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg']
+      const isJPG = typeList.includes(testmsg);
+      if (!isJPG) {
+        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarProgress(){
+      this.actionUrlLoading = true
+    },
+    handleAvatarError() {
+      this.actionUrlLoading = false
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 300px;
+    height: 300px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

src/views/tourism/scenicAreaManagement/navigationManagement/pointType.vue

@@ -120,7 +120,7 @@ import {
 import addAndEdit from "./formBox/pointTypeForm.vue"
 export default {
   name: "User",
-  dicts: ['tourism_online_status','tourism_online_type'],
+  dicts: [],
   components: {addAndEdit},
   data() {
     return {

src/views/tourism/scenicAreaManagement/navigationManagement/scenicGuide.vue

@@ -4,10 +4,10 @@
       <!--用户数据-->
       <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="景点名称" prop="name">
+          <el-form-item label="点位名称" prop="name">
             <el-input
               v-model="queryParams.name"
-              placeholder="请输入景点名称"
+              placeholder="请输入点位名称"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -28,67 +28,44 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="configPermi.add"
-            >新增</el-button>
-          </el-col>
-          <el-col :span="1.5" v-if="false">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="configPermi.delect"
-            >删除</el-button>
-          </el-col>
-          <el-col :span="1.5" v-if="false">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="configPermi.upload"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5" v-if="false">
+            >添加点位</el-button>
             <el-button
-              type="warning"
+              type="primary"
               plain
-              icon="el-icon-download"
+              icon="el-icon-plus"
               size="mini"
-              @click="handleExport"
-              v-hasPermi="configPermi.export"
-            >导出</el-button>
+              @click="handleAddImage"
+              v-hasPermi="configPermi.add"
+            >手绘图设置</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
           <el-table-column type="index" label="序号" align="center"  />
-          <el-table-column label="景点名称" align="center" key="name" prop="name" v-if="columns[0].visible">
-            <template slot-scope="scope">
-            <el-tooltip class="item" effect="dark" :content="scope.row.name" placement="top">
-              <div style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                <span style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ scope.row.name }}</span>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-          <el-table-column label="开/闭园时间" align="center" key="openDate" prop="openDate" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="开放状态" align="center" key="status" v-if="columns[2].visible">
+          <el-table-column label="点位名称" align="center" key="name" prop="name" v-if="columns[0].visible">
+              <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" :content="scope.row.name" placement="top">
+                <div style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                  <span style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ scope.row.name }}</span>
+                </div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column label="类型" align="center" key="openDate" prop="openDate" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="可用状态" align="center" key="status" v-if="columns[2].visible">
             <template slot-scope="scope">
               <switchBox 
               :defaultChecked="true" 
               v-model="scope.row.status" 
               @changeFun="openAttraction(scope.row)" 
               :disabled="false"
-              :active-value="2"
-              :inactive-value="1"
+              :active-value="1"
+              :inactive-value="0"
                />
             </template>
           </el-table-column>
-          <el-table-column label="景点产品" align="center" key="goodId" prop="goodId" v-if="columns[3].visible" />
+          <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" />
           <el-table-column
             label="操作"
             align="center"
@@ -133,6 +110,8 @@
     </el-row>
     <!--  新增或修改  -->
     <addAndEdit ref="addAndEdit" @refresh="getList" />
+    <!--  景区导览图 -->
+    <scenicGuideImageForm ref="scenicGuideImageForm" />
   </div>
 </template>
 
@@ -142,14 +121,15 @@ import {
   delTableParamsApi, 
   addTableApi
 } from "@/api/CURD";
-import addAndEdit from "./formBox/attractionInfoManagementForm.vue"
+import addAndEdit from "./formBox/scenicGuideForm.vue"
+import scenicGuideImageForm from "./formBox/scenicGuideImageForm.vue"
 export default {
   name: "User",
   dicts: [],
-  components: {addAndEdit},
+  components: {addAndEdit,scenicGuideImageForm},
   data() {
     return {
-      title: "景区管理",// 通用标题
+      title: "景区导览",// 通用标题
       configPermi: {
         add: ['system:user:edit'], // 新增权限
         details: ['system:user:details'], // 详情权限
@@ -159,12 +139,12 @@ export default {
         export: ['system:user:export'],// 导出权限
       },
       configUrl: {
-        list: '/merchant/merchantPoints/pageList', // 列表地址
-        delect: '/merchant/merchantPoints/deleteById', // 删除地址
+        list: '/merchant/merchantMapMark/pageList', // 列表地址
+        delect: '/merchant/merchantMapMark/deleteById', // 删除地址
         upload: '',// 导入地址
         download:'', // 下载模板地址
         export: '',// 导出地址
-        edit: '/merchant/merchantPoints/insertOrUpdate', // 编辑地址
+        edit: '/merchant/merchantMapMark/insertOrUpdate', // 编辑地址
       },
       // 遮罩层
       loading: true,
@@ -240,6 +220,12 @@ export default {
       this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
+    handleAddImage() {
+      if(this.$refs.scenicGuideImageForm) {
+        this.$refs.scenicGuideImageForm.initData(this.title + '新增', "EDITInit",{})
+      }
+    },
+    /** 新增按钮操作 */
     handleAdd() {
       if(this.$refs.addAndEdit) {
         this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
@@ -248,7 +234,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       if(this.$refs.addAndEdit) {
-        this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDIT",{...row})
       }
     },
     handleDetails(row){
@@ -293,14 +279,14 @@ export default {
     /** 开/闭 园 */
     openAttraction(row) {
       console.log("row======",row)
-      this.$modal.confirm(`是否确认${row.status == 2 ? '关闭' : '打开'} ${row.name}园区吗？`).then( () => {
+      this.$modal.confirm(`是否确认${row.status == 0 ? '启用' : '禁用'} ${row.name}园区吗？`).then( () => {
         return addTableApi(this.configUrl.edit,{
           ...row,
-          status: row.status == 1 ? 2 : 1
+          status: row.status == 0 ? 1 : 0
         });
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess(`${row.status == 1 ? '打开' : '关闭'}成功`);
+        this.$modal.msgSuccess(`${row.status == 0 ? '启用' : '禁用'}成功`);
       }).catch((e) => {
         console.error("失败====",e)
       });