Merge branch 'master' of http://dzgogs.hw.hongweisoft.com/tourism_project/tourism_merchant_ui

src/api/CURD.js

@@ -59,4 +59,31 @@ export function getTableDeatilsByIdApi(url,params) {
       method: 'delete',
       params
     })
-  }
+  }
+
+
+  /**  通用接口  */
+  // get
+  export function publicByGetApi(url,params) {
+    return request({
+      url: url,
+      method: 'get',
+      params
+    })
+  }
+  // post
+  export function publicByPostApi(url,data) {
+    return request({
+      url: url,
+      method: 'post',
+      data: data
+    })
+  }
+  // put
+  export function publicByPutApi(url,data) {
+    return request({
+      url: url,
+      method: 'put',
+      data: data
+    })
+  }

src/main.js

@@ -42,6 +42,10 @@ import DictData from '@/components/DictData'
 import uploadBox from "@/myComponents/uploadBox"
 Vue.component('uploadBox', uploadBox)
 
+// Switch自定义
+import switchBox from '@/myComponents/switchBox'
+Vue.component('switchBox', switchBox)
+
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey

src/myComponents/switchBox.vue

@@ -0,0 +1,134 @@
+<template>
+    <div class="m-switch-wrap">
+      <div @click="disabled ? e => e.preventDefault() : onSwitch()" :class="['m-switch', { 'switch-checked': checkedVal == activeValue, 'disabled': disabled }]">
+        <div :class="['u-switch-inner', checkedVal == activeValue ? 'inner-checked' : 'inner-unchecked' ]">{{ checkedVal == activeValue ? checkedInfo : uncheckedInfo }}</div>
+        <div :class="['u-node', { 'node-checked': checkedVal == activeValue }]"></div>
+      </div>
+    </div>
+  </template>
+  <script>
+  export default {
+    name: 'SwitchBox',
+    model: {
+      prop: 'checked',
+      event: 'change'
+    },
+    props: {
+      defaultChecked: { // 初始是否选中
+        type: Boolean,
+        default: false
+      },
+      checkedInfo: { // 选中时的内容
+        type: [Number, String],
+        default: null
+      },
+      uncheckedInfo: { // 未选中时的内容
+        type: [Number, String],
+        default: null
+      },
+      disabled: { // 是否禁用
+        type: Boolean,
+        default: false
+      },
+      checked: { // （v-model）指定当前是否选中
+        type: [String,Boolean,Number],
+        default: false
+      },
+      activeValue: { // 选中的值
+        type: [String,Boolean,Number],
+        default: true
+      },
+      inactiveValue: { // 不选中的值
+        type: [String,Boolean,Number],
+        default: false
+      },
+    },
+    data () {
+      return {
+        checkedVal: null
+      }
+    },
+    watch: {
+      checked () {
+        this.initSwitcher()
+      },
+      defaultChecked () {
+        this.initSwitcher()
+      }
+    },
+    created () {
+      this.initSwitcher()
+    },
+    methods: {
+      initSwitcher () {
+        this.checkedVal = this.checked
+        // if (typeof this.checked === 'boolean') {
+        //   this.checkedVal = this.checked
+        // } else if (typeof this.checked === 'object') {
+        //   this.checkedVal = this.defaultChecked
+        // }
+      },
+      onSwitch () {
+        //this.checkedVal = !this.checkedVal
+        //this.$emit('change', this.checkedVal)
+        this.$emit('changeFun', this.checkedVal)
+      }
+    }
+  }
+  </script>
+  <style lang="scss" scoped>
+  
+  .m-switch-wrap {
+    height: 22px;
+    min-width: 44px;
+    display: inline-block;
+    --themeColor: rgb(19, 206, 102);
+    .m-switch {
+      position: relative;
+      height: 22px;
+      color: rgba(0,0,0,.65);
+      font-size: 14px;
+      background: rgba(0,0,0,.25);
+      border-radius: 100px;
+      cursor: pointer;
+      transition: background .36s;
+      .u-switch-inner {
+        display: inline-block;
+        color: #fff;
+        font-size: 14px;
+        line-height: 22px;
+        padding: 0 8px;
+        transition: all .36s;
+      }
+      .inner-checked {
+        margin-right: 18px;
+      }
+      .inner-unchecked {
+        margin-left: 18px;
+      }
+      .u-node {
+        position: absolute;
+        top: 2px;
+        left: 2px;
+        width: 18px;
+        height: 18px;
+        background: #FFF;
+        border-radius: 100%;
+        cursor: pointer;
+        transition: all .36s;
+      }
+      .node-checked { // 结果等价于right: 2px; 为了滑动效果都以左边为基准进行偏移
+        left: 100%;
+        margin-left: -2px;
+        transform: translateX(-100%);
+      }
+    }
+    .switch-checked {
+      background: var(--themeColor);
+    }
+    .disabled {
+      cursor: not-allowed;
+      opacity: .4;
+    }
+  }
+  </style>

src/views/tourism/scenicAreaManagement/contentManagement/attractionInfo.vue

@@ -167,8 +167,6 @@
     <uploadBox ref="upload" @refresh="handleQuery" />
     <!--  新增或修改  -->
     <addAndEdit ref="addAndEdit" @refresh="getList" />
-    <!--  详情  -->
-    <detailsBox ref="detailsBox" @refresh="getList" />
   </div>
 </template>
 
@@ -178,11 +176,10 @@ import {
   delTableApi, 
   } from "@/api/CURD";
 import addAndEdit from "./formBox/attractionInfoForm.vue"
-import detailsBox from "./detailsBox/attractionInfoDetails.vue"
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: {addAndEdit,detailsBox},
+  components: {addAndEdit},
   data() {
     return {
       title: "景区信息",// 通用标题

src/views/tourism/scenicAreaManagement/contentManagement/attractionInfoManagement.vue

@@ -65,22 +65,30 @@
           </el-row>
   
           <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-            <!-- <el-table-column type="selection" width="50" align="center" /> -->
-            <el-table-column label="景点名称" align="center" key="name" prop="name" v-if="columns[0].visible" />
-            <!-- <el-table-column label="归属景区" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" /> -->
+            <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">
               <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-color="#13ce66"
-                  inactive-color="#ccc"
-                  :active-value="2"
-                  :inactive-value="1"
-                ></el-switch>
+                <switchBox 
+                :defaultChecked="true" 
+                v-model="scope.row.status" 
+                @changeFun="openAttraction(scope.row)" 
+                :disabled="false"
+                :active-value="2"
+                :inactive-value="1"
+                 />
               </template>
             </el-table-column>
-            <el-table-column label="景点产品" align="center" key="goodId" prop="goodId" v-if="columns[3].visible" width="120" />
+            <el-table-column label="景点产品" align="center" key="goodId" prop="goodId" v-if="columns[3].visible" />
             <el-table-column
               label="操作"
               align="center"
@@ -123,13 +131,8 @@
           />
         </el-col>
       </el-row>
-  
-      <!--  导入  -->
-      <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
       <!--  新增或修改  -->
       <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
     </div>
   </template>
   
@@ -137,13 +140,13 @@
   import { 
     listTableApi, 
     delTableParamsApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
+    addTableApi
+  } from "@/api/CURD";
+  import addAndEdit from "./formBox/attractionInfoManagementForm.vue"
   export default {
     name: "User",
     dicts: [],
-    components: {addAndEdit,detailsBox},
+    components: {addAndEdit},
     data() {
       return {
         title: "景区管理",// 通用标题
@@ -161,6 +164,7 @@
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
+          edit: '/merchant/merchantPoints/insertOrUpdate', // 编辑地址
         },
         // 遮罩层
         loading: true,
@@ -255,7 +259,7 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+        this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then( () => {
           return delTableParamsApi(this.configUrl.delect,{
             id: ids
           });
@@ -286,6 +290,21 @@
           })
         }
       },
+      /** 开/闭 园 */
+      openAttraction(row) {
+        console.log("row======",row)
+        this.$modal.confirm(`是否确认${row.status == 2 ? '关闭' : '打开'} ${row.name}园区吗？`).then( () => {
+          return addTableApi(this.configUrl.edit,{
+            ...row,
+            status: row.status == 1 ? 2 : 1
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess(`${row.status == 1 ? '打开' : '关闭'}成功`);
+        }).catch((e) => {
+          console.error("失败====",e)
+        });
+      },
     }
   };
   </script>

src/views/tourism/scenicAreaManagement/contentManagement/carouselAdvertis.vue

@@ -76,7 +76,15 @@
 
         <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" />
+          <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="banner图片" align="center" key="sliderImg" v-if="columns[1].visible">
             <template slot-scope="scope">
               <el-image 
@@ -107,13 +115,12 @@
           >
             <template slot-scope="scope" v-if="scope.row.id !== 1">
               <el-button
-                v-if="false"
                 size="mini"
                 type="text"
                 icon="el-icon-document"
-                @click="handleDetails(scope.row)"
-                v-hasPermi="configPermi.details"
-              >详情</el-button>
+                @click="handleRelease(scope.row)"
+                v-hasPermi="configPermi.release"
+              >{{ scope.row.onlineStatus == 0 ? '上线' : '下线' }}</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -146,8 +153,6 @@
     <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
     <!--  新增或修改  -->
     <addAndEdit ref="addAndEdit" @refresh="getList" />
-    <!--  详情  -->
-    <detailsBox ref="detailsBox" @refresh="getList" />
   </div>
 </template>
 
@@ -155,13 +160,13 @@
 import { 
   listTableApi, 
   delTableParamsApi, 
+  publicByPutApi as releaseApi
   } from "@/api/CURD";
 import addAndEdit from "./formBox/carouselAdvertisForm.vue"
-import detailsBox from "./detailsBox/navigationManagementDetails.vue"
 export default {
   name: "User",
   dicts: ['tourism_online_status','tourism_online_type'],
-  components: {addAndEdit,detailsBox},
+  components: {addAndEdit},
   data() {
     return {
       title: "轮播广告",// 通用标题
@@ -172,6 +177,7 @@ export default {
         edit: ['system:user:edit'], // 编辑权限
         upload: ['system:user:upload'],// 导入权限
         export: ['system:user:export'],// 导出权限
+        release: ['system:user:release']
       },
       configUrl: {
         list: '/merchant/advList/pageList', // 列表地址
@@ -179,6 +185,7 @@ export default {
         upload: '',// 导入地址
         download:'', // 下载模板地址
         export: '',// 导出地址
+        release: '/merchant/advList/updateStatus',// 发布接口
       },
       // 遮罩层
       loading: true,
@@ -207,7 +214,7 @@ export default {
         { key: 2, label: `banner图片`, visible: true },
         { key: 3, label: `类型`, visible: true },
         { key: 4, label: `状态`, visible: true },
-        { key: 4, label: `创建时间`, visible: true },
+        { key: 5, label: `创建时间`, visible: true },
       ],
     };
   },
@@ -274,7 +281,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then( () => {
         return delTableParamsApi(this.configUrl.delect,{
           id: ids
         });
@@ -305,6 +312,21 @@ export default {
         })
       }
     },
+    /** 发布  */
+    handleRelease(row) {
+      const ids = row.id;
+      this.$modal.confirm(`是否确认${row.onlineStatus == 0 ? '上线' : '下线'}编号为"${ids}"的数据项？`).then( () => {
+        return releaseApi(this.configUrl.release,{
+          id: ids,
+          onlineStatus: row.onlineStatus == 0 ? 1 : 0
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess(`${row.onlineStatus == 0 ? '上线' : '下线'}成功`);
+      }).catch((e) => {
+        console.error("发布失败====",e)
+      });
+    }
   }
 };
 </script>

src/views/tourism/scenicAreaManagement/contentManagement/detailsBox/attractionInfoDetails.vue

@@ -1,196 +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>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/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=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    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}
-     */
-    cancel() {
-      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/contentManagement/detailsBox/navigationManagementDetails.vue

@@ -1,196 +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>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/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=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    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}
-     */
-    cancel() {
-      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/contentManagement/eventNotifications.vue

@@ -86,7 +86,15 @@
         <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column type="index" label="序号" align="center"  />
-          <el-table-column label="公告标题" align="center" key="noticeTitle" prop="noticeTitle" v-if="columns[0].visible" />
+          <el-table-column label="公告标题" align="center" key="noticeTitle" prop="noticeTitle" v-if="columns[0].visible">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" :content="scope.row.noticeTitle" 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.noticeTitle }}</span>
+                </div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
           <el-table-column label="公告类型" align="center" key="noticeType" prop="noticeType" v-if="columns[1].visible" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tourism_notice_type" :value="scope.row.noticeType"/>
@@ -97,8 +105,8 @@
               <dict-tag :options="dict.type.tourism_notice_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
-          <el-table-column label="创建者" align="center" key="createBy" prop="createBy" v-if="columns[3].visible" width="120" />
-          <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[4].visible" width="120" />
+          <el-table-column label="创建者" align="center" key="createBy" prop="createBy" v-if="columns[3].visible" />
+          <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[4].visible" />
           <el-table-column
             label="操作"
             align="center"
@@ -141,13 +149,8 @@
         />
       </el-col>
     </el-row>
-
-    <!--  导入  -->
-    <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
     <!--  新增或修改  -->
     <addAndEdit ref="addAndEdit" @refresh="getList" />
-    <!--  详情  -->
-    <detailsBox ref="detailsBox" @refresh="getList" />
   </div>
 </template>
 
@@ -157,11 +160,10 @@ import {
   delTableApi, 
   } from "@/api/CURD";
 import addAndEdit from "./formBox/eventNotificationsForm.vue"
-import detailsBox from "./detailsBox/navigationManagementDetails.vue"
 export default {
   name: "User",
   dicts: ['tourism_notice_type','tourism_notice_status'],
-  components: {addAndEdit,detailsBox},
+  components: {addAndEdit},
   data() {
     return {
       title: "活动通知",// 通用标题
@@ -274,7 +276,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then( () => {
         return delTableApi(this.configUrl.delect,ids);
       }).then(() => {
         this.getList();

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

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     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">
@@ -21,7 +21,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -48,6 +48,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/merchantSysuser', // 新增地址
@@ -66,6 +67,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -116,6 +118,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             updateTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/navigationManagementForm.vue

@@ -9,15 +9,15 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     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-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-form-item label="开放时间：" prop="openDate">
           <el-time-picker
             is-range
             v-model="form.openDate"
@@ -28,7 +28,7 @@
             placeholder="选择开/闭园时间范围">
           </el-time-picker>
         </el-form-item>
-        <el-form-item label="景点产品" prop="goodId">
+        <el-form-item label="景点产品：" prop="goodId">
           <el-select v-model="form.goodId" placeholder="请选择景点产品">
             <el-option
               v-for="item in scenicAreaProducts"
@@ -38,21 +38,22 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开放状态" prop="openDate">
+        <el-form-item label="开/闭园：" prop="openDate">
           <el-switch
-            style="display: block"
-            v-model="form.status"
-            active-color="#13ce66"
-            inactive-color="#ccc"
-            active-text="开"
-            inactive-text="关"
-            :active-value="2"
-            :inactive-value="1"
-            >
-          </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="内容详情：" prop="content">
         </el-form-item>
         <div style="padding-left: 30px;">
           <quill-editor
@@ -72,7 +73,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -109,6 +110,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/merchantPoints/insertOrUpdate', // 新增地址
@@ -154,6 +156,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -185,7 +188,7 @@ export default {
         let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
           let obj = {
-          ...row,
+            ...res.data,
           openDate: res.data.openDate?res.data.openDate.split('~') : null
         }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
@@ -212,6 +215,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/carouselAdvertisForm.vue

@@ -9,12 +9,12 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     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="name">
-          <el-input style="width: 350px;" v-model="form.name" placeholder="请输入标题名称" maxlength="200" show-word-limit />
+          <el-input style="width: 350px;" v-model="form.name" placeholder="请输入标题名称" maxlength="50" show-word-limit />
         </el-form-item>
         <el-form-item label="类型" prop="type">
           <el-radio-group v-model="form.type">
@@ -74,7 +74,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -108,6 +108,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/advList/insertOrUpdate', // 新增地址
@@ -157,6 +158,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.actionUrlLoading = false
       this.model = model
@@ -188,8 +190,8 @@ export default {
         let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
           let obj = {
-          ...row
-        }
+            ...res.data
+          }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
         }else {
@@ -214,6 +216,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(
@@ -278,7 +281,7 @@ export default {
     // 内容改变事件
     onEditorChange({ quill, html, text }) {
       console.log('editor change!', quill, html, text)
-      this.form.noticeContent = html
+      this.form.detail = html
     },
 
 

src/views/tourism/scenicAreaManagement/contentManagement/formBox/eventNotificationsForm.vue

@@ -9,24 +9,27 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     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="noticeTitle">
-          <el-input style="width: 350px;" v-model="form.noticeTitle" placeholder="请输入公告标题" maxlength="200" show-word-limit />
-        </el-form-item>
-        <el-form-item label="公告类型" prop="noticeType">
-          <el-select style="width: 350px;" v-model="form.noticeType" placeholder="请选择公告类型">
-            <el-option
-              v-for="dict in dict.type.tourism_notice_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
+        <div style="display: flex;">
+          <el-form-item label="公告标题" prop="noticeTitle">
+            <el-input style="width: 350px;" v-model="form.noticeTitle" placeholder="请输入公告标题" maxlength="50" show-word-limit />
+          </el-form-item>
+          <el-form-item label="公告类型" prop="noticeType">
+            <el-select style="width: 350px;" v-model="form.noticeType" placeholder="请选择公告类型">
+              <el-option
+                v-for="dict in dict.type.tourism_notice_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio 
@@ -53,7 +56,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -90,6 +93,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/notice/insertOrUpdate', // 新增地址
@@ -102,8 +106,8 @@ export default {
       rules: {
         noticeTitle: [{ required: true, message: "请输入公告标题", trigger: ["change","blur"] }],
         noticeType: [{ required: true, message: "请选择公告类型", trigger: ["change","blur"] }],
-        status: [{ required: false, message: "请选择状态", trigger: ["change","blur"] }],
-        noticeContent: [{ required: true, message: "请输入内容", trigger: ["change","blur"] }],
+        status: [{ required: true, message: "请选择状态", trigger: ["change","blur"] }],
+        noticeContent: [{ required: false, message: "请输入内容", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
       // 富文本编辑器配置
@@ -134,6 +138,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -164,8 +169,8 @@ export default {
         let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
           let obj = {
-          ...row
-        }
+            ...res.data
+          }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
         }else {
@@ -190,6 +195,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoForm copy 4.vue

@@ -2,18 +2,38 @@
   <el-dialog
     :title="title"
     :visible.sync="open"
-    width="800px"
+    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-text="loadingText"
     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 :model="form" ref="form" :rules="rules" label-width="130px">
+        <el-form-item label="协议类型" prop="type">
+            <el-select style="width: 350px;" v-model="form.type" placeholder="请选择协议类型">
+              <el-option
+                v-for="dict in dict.type.tourism_noticemanagement_type"
+                :key="Number(dict.value)"
+                :label="dict.label"
+                :value="Number(dict.value)">
+              </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="内容：" prop="content">
+          <quill-editor
+              v-model="form.content"
+              ref="myQuillEditor"
+              :options="editorOption"
+              @blur="onEditorBlur($event)"
+              @focus="onEditorFocus($event)"
+              @change="onEditorChange($event)"
+              @ready="onEditorReady($event)">
+          </quill-editor>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer" v-if="formStatus==1">
@@ -21,7 +41,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -35,37 +55,71 @@
 
 <script>
 import { 
-  getTableDeatilsApi,
+  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: [],
+  dicts: ['tourism_noticemanagement_type'],
+  components: {quillEditor},
   data() {
     return {
       title: "",
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/merchantSysuser', // 新增地址
-        details: '/merchant/merchantSysuser/', // 详情地址
-        edit: '/merchant/merchantSysuser', // 编辑地址
+        add: '/merchant/agreementInfo/insertOrUpdate', // 新增地址
+        details: '/merchant/agreementInfo/selectById', // 详情地址
+        edit: '/merchant/agreementInfo/insertOrUpdate', // 编辑地址
       },
       form: {
         id: undefined,
       },
       rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
+        type: [{ 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: '请输入正文'
+      },
+
     };
   },
   methods: {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -73,7 +127,10 @@ export default {
         this.$set(this,'form',row)
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
-        this.$set(this,'form',row)
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
         this.formStatus = 1
       }else if(model=='EDITInit') { // 新增
         await this.getTableDeatilsFun(row)
@@ -90,9 +147,12 @@ export default {
       const id = row.id
       this.loading = true
       try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
+          let obj = {
+            ...res.data
+          }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
         }else {
           this.$message.error('获取详情失败!!!');
@@ -116,10 +176,13 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
-            updateTableApi(
-              this.configUrl.edit,this.form).then(response => {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.loading = false
               this.open = false;
@@ -129,7 +192,9 @@ export default {
               this.loading = false
             })
           } else {
-            addTableApi(this.configUrl.edit,this.form).then(response => {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.loading = false
               this.open = false;
@@ -161,6 +226,23 @@ 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
+    },
   },
 };
 </script>
@@ -172,6 +254,23 @@ export default {
   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;
@@ -253,6 +352,30 @@ export default {
     }
   }
 }
+
+::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: 100px;
+    height: 100px;
+    display: block;
+  }
 </style>
 <style>
 .custom-class-box {

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoForm copy 3.vue

@@ -2,18 +2,31 @@
   <el-dialog
     :title="title"
     :visible.sync="open"
-    width="800px"
+    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-text="loadingText"
     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 :model="form" ref="form" :rules="rules" label-width="130px">
+        <el-form-item label="标题名称：" prop="title">
+          <el-input style="width: 350px;" v-model="form.title" placeholder="请输入标题名称" maxlength="50" show-word-limit />
+        </el-form-item>
+        <el-form-item label="摘要：" prop="content">
+          <quill-editor
+              v-model="form.content"
+              ref="myQuillEditor"
+              :options="editorOption"
+              @blur="onEditorBlur($event)"
+              @focus="onEditorFocus($event)"
+              @change="onEditorChange($event)"
+              @ready="onEditorReady($event)">
+          </quill-editor>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer" v-if="formStatus==1">
@@ -21,7 +34,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -35,37 +48,71 @@
 
 <script>
 import { 
-  getTableDeatilsApi,
+  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: [],
+  components: {quillEditor},
   data() {
     return {
       title: "",
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/merchantSysuser', // 新增地址
-        details: '/merchant/merchantSysuser/', // 详情地址
-        edit: '/merchant/merchantSysuser', // 编辑地址
+        add: '/system/question/insertOrUpdate', // 新增地址
+        details: '/system/merchantIntroduction/selectById', // 详情地址
+        edit: '/system/question/insertOrUpdate', // 编辑地址
       },
       form: {
         id: undefined,
       },
       rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
+        title: [{ 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: '请输入正文'
+      },
+
     };
   },
   methods: {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -73,7 +120,10 @@ export default {
         this.$set(this,'form',row)
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
-        this.$set(this,'form',row)
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
         this.formStatus = 1
       }else if(model=='EDITInit') { // 新增
         await this.getTableDeatilsFun(row)
@@ -90,9 +140,12 @@ export default {
       const id = row.id
       this.loading = true
       try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
+          let obj = {
+          ...res.data
+        }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
         }else {
           this.$message.error('获取详情失败!!!');
@@ -116,10 +169,13 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
-            updateTableApi(
-              this.configUrl.edit,this.form).then(response => {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.loading = false
               this.open = false;
@@ -129,7 +185,9 @@ export default {
               this.loading = false
             })
           } else {
-            addTableApi(this.configUrl.edit,this.form).then(response => {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.loading = false
               this.open = false;
@@ -161,6 +219,23 @@ 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
+    },
   },
 };
 </script>
@@ -172,6 +247,23 @@ export default {
   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;
@@ -253,6 +345,30 @@ export default {
     }
   }
 }
+
+::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: 100px;
+    height: 100px;
+    display: block;
+  }
 </style>
 <style>
 .custom-class-box {

src/views/tourism/scenicAreaManagement/contentManagement/formBox/tourismStrategyForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     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">
@@ -67,7 +67,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -101,6 +101,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/merchantIntroduction/insertOrUpdate', // 新增地址
@@ -148,6 +149,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.actionUrlLoading = false
       this.model = model
@@ -179,8 +181,8 @@ export default {
         let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
           let obj = {
-          ...row
-        }
+            ...res.data
+          }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
         }else {
@@ -205,6 +207,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(
@@ -269,7 +272,7 @@ export default {
     // 内容改变事件
     onEditorChange({ quill, html, text }) {
       console.log('editor change!', quill, html, text)
-      this.form.noticeContent = html
+      this.form.detail = html
     },
 
 

src/views/tourism/scenicAreaManagement/contentManagement/noticeManagement.vue

@@ -1,325 +1,258 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--用户数据-->
-        <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-input
-                v-model="queryParams.name"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <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="type">
+            <el-select style="width: 350px;" v-model="queryParams.type" placeholder="请选择协议类型">
+              <el-option
+                v-for="dict in dict.type.tourism_noticemanagement_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+              </el-option>
+            </el-select>
+        </el-form-item>
+          <el-form-item label="添加时间" prop="time">
+            <el-date-picker
+              v-model="queryParams.time"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+         
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              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="type" prop="type" v-if="columns[0].visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tourism_noticemanagement_type" :value="scope.row.type"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="协议内容" align="center" key="content" prop="content" v-if="columns[1].visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span @click="handleUpdate(scope.row)" style="color: rgb(22, 132, 252);cursor: pointer;">查看</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="添加日期" align="center" key="createTime" prop="createTime" v-if="columns[2].visible" />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.id !== 1">
               <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
                 size="mini"
-                @click="handleAdd"
-                v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="configPermi.edit"
+              >修改</el-button>
               <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
                 size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
                 v-hasPermi="configPermi.delect"
               >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <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">
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</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="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope" v-if="scope.row.id !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-document"
-                  @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.details"
-                >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
-      <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
-    </div>
-  </template>
-  
-  <script>
-  import { 
-    listTableApi, 
-    delTableApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
-  export default {
-    name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: {addAndEdit,detailsBox},
-    data() {
-      return {
-        title: "导览管理",// 通用标题
-        configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-        },
-        configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        tableList: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        dateRange: [],
-        // 控制列表是否显示
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询用户列表 */
-      getList() {
-        this.loading = true;
-        listTableApi(
-          this.configUrl.list,
-          this.addDateRange(
-            this.queryParams, 
-            this.dateRange)).then(response => {
-              this.tableList = response.data.rows;
-              this.total = response.data.total;
-              this.loading = false;
-          }
-        ).catch (error=>{
-          console.error('获取列表失败!!!!',error)
-          this.tableList = [];
-          this.total = 0;
-          this.loading = false
-        }) 
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
-        }
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
-        }
-      },
-      handleDetails(row){
-        if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
-        }
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <!--  新增或修改  -->
+    <addAndEdit ref="addAndEdit" @refresh="getList" />
+  </div>
+</template>
+
+<script>
+import { 
+  listTableApi, 
+  delTableParamsApi, 
+  } from "@/api/CURD";
+import addAndEdit from "./formBox/noticeManagementForm.vue"
+export default {
+  name: "User",
+  dicts: ['tourism_noticemanagement_type'],
+  components: {addAndEdit},
+  data() {
+    return {
+      title: "须知管理",// 通用标题
+      configPermi: {
+        add: ['system:user:edit'], // 新增权限
+        details: ['system:user:details'], // 详情权限
+        delect: ['system:user:remove'], // 删除权限
+        edit: ['system:user:edit'], // 编辑权限
+        upload: ['system:user:upload'],// 导入权限
+        export: ['system:user:export'],// 导出权限
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
-          return delTableApi(this.configUrl.delect,ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      configUrl: {
+        list: '/merchant/agreementInfo/pageList', // 列表地址
+        delect: '/merchant/agreementInfo/deleteById', // 删除地址
+        upload: '',// 导入地址
+        download:'', // 下载模板地址
+        export: '',// 导出地址
       },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(this.configUrl.export, {
-          ...this.queryParams
-        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      tableList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      /** 导入按钮操作 */
-      handleImport() {
-        if(this.$refs.upload) {
-          this.$refs.upload.initData({
-            width: '400px',
-            // 弹出层标题（用户导入）
-            title: this.title + "导入",
-            // 下载模板地址
-            importTemplate: this.configUrl.download,
-            // 上传的地址
-            url: this.configUrl.upload
-          })
+      dateRange: [],
+      // 控制列表是否显示
+      columns: [
+        { key: 0, label: `协议类型`, visible: true },
+        { key: 2, label: `协议内容`, visible: true },
+        { key: 3, label: `添加时间`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      let params = JSON.parse(JSON.stringify({
+        ...this.queryParams,
+        startTime: this.queryParams.time&&this.queryParams.time[0]?this.queryParams.time[0]:null,
+        endTime: this.queryParams.time&&this.queryParams.time[1]?this.queryParams.time[1]:null,
+      }))
+      delete params.time;
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange(
+          params, 
+          this.dateRange)).then(response => {
+            this.tableList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
         }
-      },
-    }
-  };
-  </script>
-  
+      ).catch (error=>{
+        console.error('获取列表失败!!!!',error)
+        this.tableList = [];
+        this.total = 0;
+        this.loading = false
+      }) 
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+      }
+    },
+    handleDetails(row){
+      if(this.$refs.detailsBox) {
+        this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then( () => {
+        return delTableParamsApi(this.configUrl.delect,{
+          id: ids
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch((e) => {
+        console.error("删除失败====",e)
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(this.configUrl.export, {
+        ...this.queryParams
+      }, `${this.title }_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      if(this.$refs.upload) {
+        this.$refs.upload.initData({
+          width: '400px',
+          // 弹出层标题（用户导入）
+          title: this.title + "导入",
+          // 下载模板地址
+          importTemplate: this.configUrl.download,
+          // 上传的地址
+          url: this.configUrl.upload
+        })
+      }
+    },
+  }
+};
+</script>

src/views/tourism/scenicAreaManagement/contentManagement/questions.vue

@@ -1,325 +1,266 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--用户数据-->
-        <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-input
-                v-model="queryParams.name"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <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="title">
+            <el-input
+              v-model="queryParams.title"
+              placeholder="请输入标题名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="发布时间" prop="time">
+            <el-date-picker
+              v-model="queryParams.time"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              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="title" prop="title" v-if="columns[0].visible">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" :content="scope.row.title" 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.title }}</span>
+                </div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column label="摘要" align="center" key="content" prop="content" v-if="columns[1].visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" :content="scope.row.content" 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.content }}</span>
+                </div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column label="发布人员" align="center" key="createBy" prop="createBy" v-if="columns[2].visible" />
+          <el-table-column label="发布日期" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.id !== 1">
               <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
                 size="mini"
-                @click="handleAdd"
-                v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="configPermi.edit"
+              >修改</el-button>
               <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
                 size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
                 v-hasPermi="configPermi.delect"
               >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <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">
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</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="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope" v-if="scope.row.id !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-document"
-                  @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.details"
-                >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
-      <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
-    </div>
-  </template>
-  
-  <script>
-  import { 
-    listTableApi, 
-    delTableApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
-  export default {
-    name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: {addAndEdit,detailsBox},
-    data() {
-      return {
-        title: "导览管理",// 通用标题
-        configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-        },
-        configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        tableList: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        dateRange: [],
-        // 控制列表是否显示
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询用户列表 */
-      getList() {
-        this.loading = true;
-        listTableApi(
-          this.configUrl.list,
-          this.addDateRange(
-            this.queryParams, 
-            this.dateRange)).then(response => {
-              this.tableList = response.data.rows;
-              this.total = response.data.total;
-              this.loading = false;
-          }
-        ).catch (error=>{
-          console.error('获取列表失败!!!!',error)
-          this.tableList = [];
-          this.total = 0;
-          this.loading = false
-        }) 
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
-        }
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
-        }
-      },
-      handleDetails(row){
-        if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
-        }
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <!--  新增或修改  -->
+    <addAndEdit ref="addAndEdit" @refresh="getList" />
+  </div>
+</template>
+
+<script>
+import { 
+  listTableApi, 
+  delTableParamsApi, 
+  } from "@/api/CURD";
+import addAndEdit from "./formBox/questionsForm.vue"
+export default {
+  name: "User",
+  dicts: [],
+  components: {addAndEdit},
+  data() {
+    return {
+      title: "常见问题",// 通用标题
+      configPermi: {
+        add: ['system:user:edit'], // 新增权限
+        details: ['system:user:details'], // 详情权限
+        delect: ['system:user:remove'], // 删除权限
+        edit: ['system:user:edit'], // 编辑权限
+        upload: ['system:user:upload'],// 导入权限
+        export: ['system:user:export'],// 导出权限
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
-          return delTableApi(this.configUrl.delect,ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      configUrl: {
+        list: '/system/question/pageList', // 列表地址
+        delect: '/system/question/deleteById', // 删除地址
+        upload: '',// 导入地址
+        download:'', // 下载模板地址
+        export: '',// 导出地址
       },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(this.configUrl.export, {
-          ...this.queryParams
-        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      tableList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      /** 导入按钮操作 */
-      handleImport() {
-        if(this.$refs.upload) {
-          this.$refs.upload.initData({
-            width: '400px',
-            // 弹出层标题（用户导入）
-            title: this.title + "导入",
-            // 下载模板地址
-            importTemplate: this.configUrl.download,
-            // 上传的地址
-            url: this.configUrl.upload
-          })
+      dateRange: [],
+      // 控制列表是否显示
+      columns: [
+        { key: 0, label: `标题`, visible: true },
+        { key: 2, label: `摘要`, visible: true },
+        { key: 3, label: `发布人员`, visible: true },
+        { key: 4, label: `发布时间`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      let params = JSON.parse(JSON.stringify({
+        ...this.queryParams,
+        startTime: this.queryParams.time&&this.queryParams.time[0]?this.queryParams.time[0]:null,
+        endTime: this.queryParams.time&&this.queryParams.time[1]?this.queryParams.time[1]:null,
+      }))
+      delete params.time;
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange(
+          params, 
+          this.dateRange)).then(response => {
+            this.tableList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
         }
-      },
-    }
-  };
-  </script>
-  
+      ).catch (error=>{
+        console.error('获取列表失败!!!!',error)
+        this.tableList = [];
+        this.total = 0;
+        this.loading = false
+      }) 
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDIT",{...row})
+      }
+    },
+    handleDetails(row){
+      if(this.$refs.detailsBox) {
+        this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then( () => {
+        return delTableParamsApi(this.configUrl.delect,{
+          id: ids
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch((e) => {
+        console.error("删除失败====",e)
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(this.configUrl.export, {
+        ...this.queryParams
+      }, `${this.title }_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      if(this.$refs.upload) {
+        this.$refs.upload.initData({
+          width: '400px',
+          // 弹出层标题（用户导入）
+          title: this.title + "导入",
+          // 下载模板地址
+          importTemplate: this.configUrl.download,
+          // 上传的地址
+          url: this.configUrl.upload
+        })
+      }
+    },
+  }
+};
+</script>

src/views/tourism/scenicAreaManagement/contentManagement/suggestions.vue

@@ -16,7 +16,7 @@
           <el-form-item label="类型" prop="type">
             <el-select v-model="queryParams.type" clearable placeholder="请选择状态">
               <el-option
-                v-for="dict in dict.type.tourism_online_status"
+                v-for="dict in dict.type.tourism_suggestions_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value">
@@ -36,15 +36,19 @@
           <el-table-column label="用户昵称" align="center" key="memberNickName" prop="memberNickName" v-if="columns[0].visible" />
           <el-table-column label="类型" align="center" key="type" prop="type" v-if="columns[1].visible" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.tourism_online_status" :value="scope.row.onlineStatus"/>
+              <dict-tag :options="dict.type.tourism_suggestions_type" :value="scope.row.type"/>
             </template>
           </el-table-column>
           <el-table-column label="留言内容" align="center" key="content" v-if="columns[2].visible" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span style="width: 200px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{ scope.row.content }}</span>
+              <el-tooltip class="item" effect="dark" :content="scope.row.content" 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.content }}</span>
+                </div>
+              </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column label="留言时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" width="120" />
+          <el-table-column label="留言时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" />
         </el-table>
 
         <pagination
@@ -66,7 +70,7 @@ import {
   } from "@/api/CURD";
 export default {
   name: "User",
-  dicts: [],
+  dicts: ['tourism_suggestions_type'],
   components: {},
   data() {
     return {

src/views/tourism/scenicAreaManagement/contentManagement/tourismStrategy.vue

@@ -66,20 +66,29 @@
 
         <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="title" prop="title" v-if="columns[0].visible" />
+          <el-table-column label="标题名称" align="center" key="title" prop="title" v-if="columns[0].visible">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" :content="scope.row.title" 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.title }}</span>
+                </div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
           <el-table-column label="发布时间" align="center" key="releaseTime" prop="releaseTime" 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">
-              <el-switch
-                v-model="scope.row.status"
-                active-color="#13ce66"
-                inactive-color="#ccc"
+              <switchBox 
+                :defaultChecked="true" 
+                v-model="scope.row.status" 
+                @changeFun="handleRelease(scope.row)" 
+                :disabled="false"
                 :active-value="2"
                 :inactive-value="1"
-              ></el-switch>
+                 />
             </template>
           </el-table-column>
-          <el-table-column label="发布人" align="center" key="releaseBy" prop="releaseBy" v-if="columns[3].visible" width="120" />
+          <el-table-column label="发布人" align="center" key="releaseBy" prop="releaseBy" v-if="columns[3].visible" />
           <el-table-column
             label="操作"
             align="center"
@@ -87,14 +96,6 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope" v-if="scope.row.id !== 1">
-              <el-button
-                v-if="false"
-                size="mini"
-                type="text"
-                icon="el-icon-document"
-                @click="handleDetails(scope.row)"
-                v-hasPermi="configPermi.details"
-              >详情</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -122,13 +123,8 @@
         />
       </el-col>
     </el-row>
-
-    <!--  导入  -->
-    <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
     <!--  新增或修改  -->
     <addAndEdit ref="addAndEdit" @refresh="getList" />
-    <!--  详情  -->
-    <detailsBox ref="detailsBox" @refresh="getList" />
   </div>
 </template>
 
@@ -136,16 +132,16 @@
 import { 
   listTableApi, 
   delTableParamsApi, 
+  publicByPutApi as releaseApi
   } from "@/api/CURD";
 import addAndEdit from "./formBox/tourismStrategyForm.vue"
-import detailsBox from "./detailsBox/navigationManagementDetails.vue"
 export default {
   name: "User",
   dicts: [],
-  components: {addAndEdit,detailsBox},
+  components: {addAndEdit},
   data() {
     return {
-      title: "景区管理",// 通用标题
+      title: "旅游攻略",// 通用标题
       configPermi: {
         add: ['system:user:edit'], // 新增权限
         details: ['system:user:details'], // 详情权限
@@ -153,6 +149,7 @@ export default {
         edit: ['system:user:edit'], // 编辑权限
         upload: ['system:user:upload'],// 导入权限
         export: ['system:user:export'],// 导出权限
+        release: ['system:user:release']
       },
       configUrl: {
         list: '/merchant/merchantIntroduction/pageList', // 列表地址
@@ -160,6 +157,7 @@ export default {
         upload: '',// 导入地址
         download:'', // 下载模板地址
         export: '',// 导出地址
+        release: '/merchant/merchantIntroduction/updateStatus',// 上下线接口
       },
       // 遮罩层
       loading: true,
@@ -253,7 +251,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then( () => {
         return delTableParamsApi(this.configUrl.delect,{
           id: ids
         });
@@ -284,6 +282,21 @@ export default {
         })
       }
     },
+    /** 开/闭 园 */
+    handleRelease(row) {
+      const ids = row.id;
+      this.$modal.confirm(`是否确认${row.status == 1 ? '上架' : '下架'}编号为"${ids}"的数据项？`).then( () => {
+        return releaseApi(this.configUrl.release,{
+          id: ids,
+          status: row.status == 1 ? 2 : 1
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess(`${row.status == 1 ? '上架' : '下架'}成功`);
+      }).catch((e) => {
+        console.error("发布失败====",e)
+      });
+    }
   }
 };
 </script>

src/views/tourism/scenicAreaManagement/navigationManagement/detailsBox/attractionInfoDetails copy 2.vue

@@ -1,196 +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>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/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=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    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}
-     */
-    cancel() {
-      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/detailsBox/attractionInfoDetails copy 3.vue

@@ -1,196 +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>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/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=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    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}
-     */
-    cancel() {
-      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/detailsBox/attractionInfoDetails.vue

@@ -1,196 +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>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/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=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    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}
-     */
-    cancel() {
-      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/detailsBox/navigationManagementDetails.vue

@@ -1,196 +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>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/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=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    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}
-     */
-    cancel() {
-      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/attractionInfoForm copy 2.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/attractionInfoForm copy 3.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/attractionInfoForm copy 4.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/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/navigationManagementForm.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

@@ -0,0 +1,424 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="600px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    :element-loading-text="loadingText"
+    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="name">
+          <el-input style="width: 350px;" v-model="form.name" placeholder="请输入类型名称" maxlength="50" show-word-limit />
+        </el-form-item>
+        <el-form-item label="图标" prop="iconImg">
+          <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.iconImg" style="width: 100px;height: 100px;background-color: rgba(211,211,211,0.6);" :src="form.iconImg" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+          <span>建议尺寸40*40,支持jpg,png,gif,支持1MB大小以内的图片上传</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"
+        :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,
+  listTableApi
+ } from '@/api/CURD'
+
+export default {
+  name: "addAndEdit",
+  dicts: [],
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantMapMarkType/insertOrUpdate', // 新增地址
+        details: '/merchant/advList/selectById', // 详情地址
+        edit: '/merchant/merchantMapMarkType/insertOrUpdate', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        name: [{ required: true, message: "请输入类型名称", trigger: ["change","blur"] }],
+        iconImg: [{ 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: '请输入正文'
+      },
+
+      //  上传文件
+      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.loadingText = "拼命加载数据中..."
+      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.loadingText = "提交数据中..."
+          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,'iconImg',null) 
+      }else {
+        this.$set(this.form,'iconImg',res.data.url) 
+      }
+      
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 <= 1;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg','gif']
+      const isJPG = typeList.includes(testmsg);
+      if (!isJPG) {
+        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+
+      isSize = new Promise(function (resolve, reject) {
+          let _URL = window.URL || window.webkitURL;
+          let img = new Image();
+          img.onload = function () {
+            let valid = img.width == 40 && img.height == 40;
+            valid ? resolve() : reject();
+          };
+          img.src = _URL.createObjectURL(file);
+        }).then(
+          () => {
+            return file;
+          },
+          () => {
+            this.$message.error("上传图片尺寸只能是 40*40 px !");
+            return Promise.reject();
+          }
+        );
+      return isJPG && isLt2M && isSize;
+    },
+    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: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoForm copy 2.vue

@@ -2,18 +2,44 @@
   <el-dialog
     :title="title"
     :visible.sync="open"
-    width="800px"
+    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-text="loadingText"
     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-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="typeId">
+          <el-select v-model="form.typeId" placeholder="请选择点位类型">
+            <el-option
+              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="地图定位：">
+          <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>
+
+        </div>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer" v-if="formStatus==1">
@@ -21,7 +47,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -35,10 +61,12 @@
 
 <script>
 import { 
-  getTableDeatilsApi,
+  getTableDeatilsByIdApi,
   updateTableApi,
-  addTableApi
+  addTableApi,
+  listTableApi
  } from '@/api/CURD'
+
 export default {
   name: "addAndEdit",
   dicts: [],
@@ -48,24 +76,35 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/merchantSysuser', // 新增地址
-        details: '/merchant/merchantSysuser/', // 详情地址
-        edit: '/merchant/merchantSysuser', // 编辑地址
+        add: '/merchant/merchantMapMark/insertOrUpdate', // 新增地址
+        details: '', // 详情地址
+        edit: '/merchant/merchantMapMark/insertOrUpdate', // 编辑地址
+        pointTypeList: '/merchant/merchantMapMarkType/list'
       },
       form: {
         id: undefined,
       },
       rules: {
-        xxx: [{ required: true, message: "请输入xxx", 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"] }],
+      },
+      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
@@ -73,7 +112,11 @@ export default {
         this.$set(this,'form',row)
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
-        this.$set(this,'form',row)
+        let obj = {
+          ...row,
+          openDate: row.openDate?row.openDate.join('~') : null
+        }
+        this.$set(this,'form',obj)
         this.formStatus = 1
       }else if(model=='EDITInit') { // 新增
         await this.getTableDeatilsFun(row)
@@ -90,9 +133,12 @@ export default {
       const id = row.id
       this.loading = true
       try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
+          let obj = {
+            ...res.data
+          }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
         }else {
           this.$message.error('获取详情失败!!!');
@@ -116,10 +162,14 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
+          this.loadingText = "提交数据中..."
           if (this.model != 'ADD') {
-            updateTableApi(
-              this.configUrl.edit,this.form).then(response => {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.loading = false
               this.open = false;
@@ -129,7 +179,9 @@ export default {
               this.loading = false
             })
           } else {
-            addTableApi(this.configUrl.edit,this.form).then(response => {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.loading = false
               this.open = false;
@@ -161,6 +213,21 @@ export default {
       this.reset();
       this.open = false;
     },
+    /** 查询用户列表 */
+    getPointList() {
+      listTableApi(
+        this.configUrl.pointTypeList,
+        {
+          pageSize: 999,
+          pageNum: 1
+        }).then(response => {
+            this.pointTypeList = response.data.rows;
+        }
+      ).catch (error=>{
+        console.error('获取点位类型失败!!!!',error)
+        this.pointTypeList = [];
+      }) 
+    },
   },
 };
 </script>
@@ -172,6 +239,23 @@ export default {
   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;

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

@@ -0,0 +1,424 @@
+<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="loadingText"
+    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"
+        :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,
+      loadingText: "拼命加载数据中...",
+      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.loadingText = "拼命加载数据中..."
+      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.loadingText = "提交数据中..."
+          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

@@ -1,325 +1,271 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--用户数据-->
-        <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-input
-                v-model="queryParams.name"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <el-col :span="24" :xs="24">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              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
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="configPermi.export"
+            >导出</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="iconImg" v-if="columns[1].visible">
+            <template slot-scope="scope">
+              <el-image 
+
+              v-if="scope.row.iconImg"
+                style="width: 40px; height: 40px;background-color: rgba(211,211,211,0.6);"
+                :src="scope.row.iconImg" 
+                :preview-src-list="[scope.row.iconImg]">
+              </el-image>
+              <span v-else>暂无图片</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="点位数" align="center" key="counts" prop="counts" v-if="columns[2].visible" />  
+          <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.id !== 1">
               <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
                 size="mini"
-                @click="handleAdd"
-                v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="configPermi.edit"
+              >修改</el-button>
               <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
                 size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
                 v-hasPermi="configPermi.delect"
               >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <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">
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</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="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope" v-if="scope.row.id !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-document"
-                  @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.details"
-                >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
-      <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
-    </div>
-  </template>
-  
-  <script>
-  import { 
-    listTableApi, 
-    delTableApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
-  export default {
-    name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: {addAndEdit,detailsBox},
-    data() {
-      return {
-        title: "景区管理",// 通用标题
-        configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-        },
-        configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        tableList: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        dateRange: [],
-        // 控制列表是否显示
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询用户列表 */
-      getList() {
-        this.loading = true;
-        listTableApi(
-          this.configUrl.list,
-          this.addDateRange(
-            this.queryParams, 
-            this.dateRange)).then(response => {
-              this.tableList = response.data.rows;
-              this.total = response.data.total;
-              this.loading = false;
-          }
-        ).catch (error=>{
-          console.error('获取列表失败!!!!',error)
-          this.tableList = [];
-          this.total = 0;
-          this.loading = false
-        }) 
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
-        }
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
-        }
-      },
-      handleDetails(row){
-        if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
-        }
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <!--  新增或修改  -->
+    <addAndEdit ref="addAndEdit" @refresh="getList" />
+  </div>
+</template>
+
+<script>
+import { 
+  listTableApi, 
+  delTableParamsApi,
+  } from "@/api/CURD";
+import addAndEdit from "./formBox/pointTypeForm.vue"
+export default {
+  name: "User",
+  dicts: [],
+  components: {addAndEdit},
+  data() {
+    return {
+      title: "点位类型",// 通用标题
+      configPermi: {
+        add: ['system:user:edit'], // 新增权限
+        details: ['system:user:details'], // 详情权限
+        delect: ['system:user:remove'], // 删除权限
+        edit: ['system:user:edit'], // 编辑权限
+        upload: ['system:user:upload'],// 导入权限
+        export: ['system:user:export'],// 导出权限
+        release: ['system:user:release']
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
-          return delTableApi(this.configUrl.delect,ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      configUrl: {
+        list: '/merchant/merchantMapMarkType/list', // 列表地址
+        delect: '/merchant/merchantMapMarkType/deleteById', // 删除地址
+        upload: '',// 导入地址
+        download:'', // 下载模板地址
+        export: '',// 导出地址
       },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(this.configUrl.export, {
-          ...this.queryParams
-        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      tableList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      /** 导入按钮操作 */
-      handleImport() {
-        if(this.$refs.upload) {
-          this.$refs.upload.initData({
-            width: '400px',
-            // 弹出层标题（用户导入）
-            title: this.title + "导入",
-            // 下载模板地址
-            importTemplate: this.configUrl.download,
-            // 上传的地址
-            url: this.configUrl.upload
-          })
+      dateRange: [],
+      // 控制列表是否显示
+      columns: [
+        { key: 0, label: `类型名称`, visible: true },
+        // { key: 1, label: `归属景区`, visible: true },
+        { key: 2, label: `图标`, visible: true },
+        { key: 3, label: `类型`, visible: true },
+        { key: 4, label: `点位数`, visible: true },
+        { key: 5, label: `创建时间`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange(
+          this.queryParams, 
+          this.dateRange)).then(response => {
+            this.tableList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
         }
-      },
-    }
-  };
-  </script>
-  
+      ).catch (error=>{
+        console.error('获取列表失败!!!!',error)
+        this.tableList = [];
+        this.total = 0;
+        this.loading = false
+      }) 
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDIT",{...row})
+      }
+    },
+    handleDetails(row){
+      if(this.$refs.detailsBox) {
+        this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then( () => {
+        return delTableParamsApi(this.configUrl.delect,{
+          id: ids
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch((e) => {
+        console.error("删除失败====",e)
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(this.configUrl.export, {
+        ...this.queryParams
+      }, `${this.title }_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      if(this.$refs.upload) {
+        this.$refs.upload.initData({
+          width: '400px',
+          // 弹出层标题（用户导入）
+          title: this.title + "导入",
+          // 下载模板地址
+          importTemplate: this.configUrl.download,
+          // 上传的地址
+          url: this.configUrl.upload
+        })
+      }
+    },
+  }
+};
+</script>

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

@@ -1,325 +1,296 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--用户数据-->
-        <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-input
-                v-model="queryParams.name"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <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-input
+              v-model="queryParams.name"
+              placeholder="请输入点位名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="configPermi.add"
+            >添加点位</el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @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="typeName" prop="typeName" 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="1"
+              :inactive-value="0"
+               />
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.id !== 1">
               <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
+                v-if="false"
                 size="mini"
-                @click="handleAdd"
-                v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <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">
+                type="text"
+                icon="el-icon-document"
+                @click="handleDetails(scope.row)"
+                v-hasPermi="configPermi.details"
+              >详情</el-button>
               <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">
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="configPermi.edit"
+              >修改</el-button>
               <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
                 size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</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="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope" v-if="scope.row.id !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-document"
-                  @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.details"
-                >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
-      <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
-    </div>
-  </template>
-  
-  <script>
-  import { 
-    listTableApi, 
-    delTableApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
-  export default {
-    name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: {addAndEdit,detailsBox},
-    data() {
-      return {
-        title: "景区管理",// 通用标题
-        configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-        },
-        configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        tableList: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        dateRange: [],
-        // 控制列表是否显示
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询用户列表 */
-      getList() {
-        this.loading = true;
-        listTableApi(
-          this.configUrl.list,
-          this.addDateRange(
-            this.queryParams, 
-            this.dateRange)).then(response => {
-              this.tableList = response.data.rows;
-              this.total = response.data.total;
-              this.loading = false;
-          }
-        ).catch (error=>{
-          console.error('获取列表失败!!!!',error)
-          this.tableList = [];
-          this.total = 0;
-          this.loading = false
-        }) 
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
-        }
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
-        }
-      },
-      handleDetails(row){
-        if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
-        }
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="configPermi.delect"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <!--  新增或修改  -->
+    <addAndEdit ref="addAndEdit" @refresh="getList" />
+    <!--  景区导览图 -->
+    <scenicGuideImageForm ref="scenicGuideImageForm" />
+  </div>
+</template>
+
+<script>
+import { 
+  listTableApi, 
+  delTableParamsApi, 
+  addTableApi
+} from "@/api/CURD";
+import addAndEdit from "./formBox/scenicGuideForm.vue"
+import scenicGuideImageForm from "./formBox/scenicGuideImageForm.vue"
+export default {
+  name: "User",
+  dicts: [],
+  components: {addAndEdit,scenicGuideImageForm},
+  data() {
+    return {
+      title: "景区导览",// 通用标题
+      configPermi: {
+        add: ['system:user:edit'], // 新增权限
+        details: ['system:user:details'], // 详情权限
+        delect: ['system:user:remove'], // 删除权限
+        edit: ['system:user:edit'], // 编辑权限
+        upload: ['system:user:upload'],// 导入权限
+        export: ['system:user:export'],// 导出权限
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
-          return delTableApi(this.configUrl.delect,ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      configUrl: {
+        list: '/merchant/merchantMapMark/pageList', // 列表地址
+        delect: '/merchant/merchantMapMark/deleteById', // 删除地址
+        upload: '',// 导入地址
+        download:'', // 下载模板地址
+        export: '',// 导出地址
+        edit: '/merchant/merchantMapMark/insertOrUpdate', // 编辑地址
       },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(this.configUrl.export, {
-          ...this.queryParams
-        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      tableList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      /** 导入按钮操作 */
-      handleImport() {
-        if(this.$refs.upload) {
-          this.$refs.upload.initData({
-            width: '400px',
-            // 弹出层标题（用户导入）
-            title: this.title + "导入",
-            // 下载模板地址
-            importTemplate: this.configUrl.download,
-            // 上传的地址
-            url: this.configUrl.upload
-          })
+      dateRange: [],
+      // 控制列表是否显示
+      columns: [
+        { key: 0, label: `景点名称`, visible: true },
+        // { key: 1, label: `归属景区`, visible: true },
+        { key: 2, label: `开/闭园时间`, visible: true },
+        { key: 3, label: `开放状态`, visible: true },
+        { key: 4, label: `景点产品`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange(
+          this.queryParams, 
+          this.dateRange)).then(response => {
+            this.tableList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
         }
-      },
-    }
-  };
-  </script>
-  
+      ).catch (error=>{
+        console.error('获取列表失败!!!!',error)
+        this.tableList = [];
+        this.total = 0;
+        this.loading = false
+      }) 
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      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",{})
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDIT",{...row})
+      }
+    },
+    handleDetails(row){
+      if(this.$refs.detailsBox) {
+        this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then( () => {
+        return delTableParamsApi(this.configUrl.delect,{
+          id: ids
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch((e) => {
+        console.error("删除失败====",e)
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(this.configUrl.export, {
+        ...this.queryParams
+      }, `${this.title }_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      if(this.$refs.upload) {
+        this.$refs.upload.initData({
+          width: '400px',
+          // 弹出层标题（用户导入）
+          title: this.title + "导入",
+          // 下载模板地址
+          importTemplate: this.configUrl.download,
+          // 上传的地址
+          url: this.configUrl.upload
+        })
+      }
+    },
+    /** 开/闭 园 */
+    openAttraction(row) {
+      console.log("row======",row)
+      this.$modal.confirm(`是否确认${row.status == 0 ? '启用' : '禁用'} ${row.name}园区吗？`).then( () => {
+        return addTableApi(this.configUrl.edit,{
+          ...row,
+          status: row.status == 0 ? 1 : 0
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess(`${row.status == 0 ? '启用' : '禁用'}成功`);
+      }).catch((e) => {
+        console.error("失败====",e)
+      });
+    },
+  }
+};
+</script>