1. 完成经度管理

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

@@ -0,0 +1,523 @@
+<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="titleName">
+          <el-input style="width: 350px;" v-model="form.titleName" placeholder="请输入标题名称" maxlength="50" show-word-limit />
+        </el-form-item>
+        <el-form-item label="内容摘要" prop="contentMain">
+          <el-input style="width: 350px;" v-model="form.contentMain" type="textarea" placeholder="请输入标题名称" />
+        </el-form-item>
+        <el-form-item label="封面上传" prop="imgUrl">
+          <div style="display: flex;">
+            <div 
+            v-for="(item,index) in form.imgUrl" 
+            :key="index"
+            style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
+              <el-image 
+                style="width: 100%; height: 100%"
+                :src="item" 
+                :preview-src-list="form.imgUrl">
+              </el-image>
+              <span @click="handleRemove(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
+                <i class="el-icon-error"></i>
+              </span>
+            </div>
+            <div 
+            style="width: 100px; height: 100px;" 
+            v-if="!form.imgUrl||form.imgUrl.length<1"
+            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"
+                :before-upload="beforeAvatarUpload"
+                :on-success="handleAvatarSuccess"
+                :on-progress="handleAvatarProgress"
+                :disabled="actionUrlLoading"
+                :on-error="handleAvatarError"
+                >
+                <i class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </div>
+            
+          </div>
+          <span>支持jpg、png、gif,支持1MB大小以内的图片上传</span>
+        </el-form-item>
+        <el-form-item label="内容详情" prop="contentType">
+          <el-radio-group v-model="form.contentType" @input="setContentType">
+            <el-radio 
+              v-for="dict in dict.type.tourism_attractionInfoIntroduce_type"
+              :label="Number(dict.value)"
+              >{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label=""  label-width="0" prop="content">
+          <el-input v-if="form.contentType==2" style="width: 350px;" v-model="form.content" placeholder="请输入链接内容" />
+          <quill-editor
+            v-if="form.contentType==1"
+            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">
+      <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_attractionInfoIntroduce_type'],
+  components: {quillEditor},
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantDetail/insertOrUpdate', // 新增地址
+        details: '/merchant/merchantDetail/selectById', // 详情地址
+        edit: '/merchant/merchantDetail/insertOrUpdate', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        titleName: [{ required: true, message: "请输入标题名称", trigger: ["change","blur"] }],
+        contentMain: [{ required: true, message: "请输入内容摘要", trigger: ["change","blur"] }],
+        imgUrl: [{ required: true, message: "请上传封面上传图片", trigger: ["change","blur"] }],
+        photos: [{ required: true, message: "请上传景区相册图片", trigger: ["change","blur"] }],
+        contentType: [{ 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: '请输入正文'
+      },
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+      actionUrlMoreLoading: false,
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loadingText = "拼命加载数据中..."
+      this.loading = true
+      this.actionUrlLoading = false
+      this.actionUrlMoreLoading = false
+      this.model = model
+      this.formStatus = 0
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',{...row,imgUrl:[]})
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row,
+          imgUrl: row.imgUrl?row.imgUrl.split(','):[]
+        }
+        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,
+            imgUrl: row.imgUrl?row.imgUrl.split(','):[]
+          }
+          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,{
+                type: 2,
+                ...this.form,
+                imgUrl: this.form.imgUrl ? this.form.imgUrl.join(','):'',
+              }).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,{
+                type: 2,
+                ...this.form,
+                imgUrl: this.form.imgUrl ? this.form.imgUrl.join(','):'',
+              }).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;
+    },
+
+    /**  切换内容 */
+    setContentType(){
+      this.$set(this.form,'content','')
+    },
+
+    // 失去焦点事件
+    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
+    },
+
+
+    /**  上传图片 单张  */
+    handleAvatarSuccess(response, file, fileList) {
+      console.log("res, file",response, file, fileList)
+      this.actionUrlLoading = false
+      if(response.code == 200) {
+        this.form.imgUrl.push(response.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('上传头像图片大小不能超过 1MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarProgress(){
+      this.actionUrlLoading = true
+    },
+    handleAvatarError() {
+      this.actionUrlLoading = false
+    },
+    handleRemove(index) {
+      this.form.imgUrl.splice(index,1)
+    },
+    /**  上传图片 多张  */
+    beforeAvatarUploadMore(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('上传头像图片大小不能超过 1MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarSuccessMore(response, file, fileList) {
+      console.log("res, file===",response, file, fileList)
+      this.actionUrlMoreLoading = false
+      if(response.code == 200) {
+        this.form.photos.push(response.data.url)
+      }
+      // if(res.code != 200) {
+      //   this.$set(this.form,'photos',null) 
+      // }else {
+      //   this.$set(this.form,'photos',res.data.url) 
+      // }
+      
+    },
+    handleRemoveMore(index) {
+      this.form.photos.splice(index,1)
+    },
+    handleAvatarProgressMore(){
+      this.actionUrlMoreLoading = true
+    },
+    handleAvatarErrorMore() {
+      this.actionUrlMoreLoading = 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/attractionInfoIntroduceForm.vue

@@ -20,31 +20,45 @@
           <el-input style="width: 350px;" v-model="form.contentMain" type="textarea" placeholder="请输入标题名称" />
         </el-form-item>
         <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: 100px;height: 100px;" :src="form.imgUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
+          <div style="display: flex;">
+            <div 
+            v-for="(item,index) in form.imgUrl" 
+            :key="index"
+            style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
+              <el-image 
+                style="width: 100%; height: 100%"
+                :src="item" 
+                :preview-src-list="form.imgUrl">
+              </el-image>
+              <span @click="handleRemove(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
+                <i class="el-icon-error"></i>
+              </span>
+            </div>
+            <div 
+            style="width: 100px; height: 100px;" 
+            v-if="!form.imgUrl||form.imgUrl.length<5"
+            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"
+                :before-upload="beforeAvatarUpload"
+                :on-success="handleAvatarSuccess"
+                :on-progress="handleAvatarProgress"
+                :disabled="actionUrlLoading"
+                :on-error="handleAvatarError"
+                >
+                <i class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </div>
+            
           </div>
           <span>支持jpg、png、gif,支持1MB大小以内的图片上传</span>
         </el-form-item>
@@ -59,13 +73,13 @@
                 :src="item" 
                 :preview-src-list="form.photos">
               </el-image>
-              <span @click="handleRemoveMore" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
+              <span @click="handleRemoveMore(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
                 <i class="el-icon-error"></i>
               </span>
             </div>
             <div 
             style="width: 100px; height: 100px;" 
-            v-if="form.photos.length<20"
+            v-if="!form.photos||form.photos.length<20"
             v-loading="actionUrlMoreLoading"
             element-loading-text="上传中..."
             element-loading-spinner="el-icon-loading"
@@ -212,12 +226,13 @@ export default {
       this.model = model
       this.formStatus = 0
       if(model=='ADD') { // 新增
-        this.$set(this,'form',{...row,photos:[]})
+        this.$set(this,'form',{...row,photos:[],imgUrl:[]})
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
         let obj = {
           ...row,
-          photos: row.photos?row.photos.split(','):[]
+          photos: row.photos?row.photos.split(','):[],
+          imgUrl: row.imgUrl?row.imgUrl.split(','):[]
         }
         this.$set(this,'form',obj)
         this.formStatus = 1
@@ -240,7 +255,8 @@ export default {
         if(res.code == 200) {
           let obj = {
             ...res.data,
-            photos: res.data.photos?res.data.photos.split(','):[]
+            photos: res.data.photos?res.data.photos.split(','):[],
+            imgUrl: row.imgUrl?row.imgUrl.split(','):[]
           }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
@@ -273,6 +289,7 @@ export default {
               this.configUrl.edit,{
                 type: 1,
                 ...this.form,
+                imgUrl: this.form.imgUrl ? this.form.imgUrl.join(','):'',
                 photos: this.form.photos ? this.form.photos.join(','):''
               }).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -287,6 +304,7 @@ export default {
             addTableApi(this.configUrl.edit,{
                 type: 1,
                 ...this.form,
+                imgUrl: this.form.imgUrl ? this.form.imgUrl.join(','):'',
                 photos: this.form.photos ? this.form.photos.join(','):''
               }).then(response => {
               this.$modal.msgSuccess("新增成功");
@@ -346,15 +364,12 @@ export default {
 
 
     /**  上传图片 单张  */
-    handleAvatarSuccess(res, file) {
-      console.log("res, file",res, file)
+    handleAvatarSuccess(response, file, fileList) {
+      console.log("res, file",response, file, fileList)
       this.actionUrlLoading = false
-      if(res.code != 200) {
-        this.$set(this.form,'imgUrl',null) 
-      }else {
-        this.$set(this.form,'imgUrl',res.data.url) 
+      if(response.code == 200) {
+        this.form.imgUrl.push(response.data.url)
       }
-      
     },
     beforeAvatarUpload(file) {
       const isLt2M = file.size / 1024 / 1024 < 1;
@@ -375,6 +390,9 @@ export default {
     handleAvatarError() {
       this.actionUrlLoading = false
     },
+    handleRemove(index) {
+      this.form.imgUrl.splice(index,1)
+    },
     /**  上传图片 多张  */
     beforeAvatarUploadMore(file) {
       const isLt2M = file.size / 1024 / 1024 < 1;

src/views/tourism/scenicAreaManagement/contentManagement/tabelBox/attractionInfoCulture.vue

@@ -0,0 +1,333 @@
+<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="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>
+            <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="titleName" prop="titleName" v-if="columns[0].visible">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" :content="scope.row.titleName" 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.titleName }}</span>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column label="摘要" align="center" key="contentMain" prop="contentMain" v-if="columns[1].visible">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" :content="scope.row.contentMain" 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.contentMain }}</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" key="status" v-if="columns[4].visible">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tourism_attractionInfoIntroduce_status" :value="scope.row.status"/>
+              </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="handleRelease(scope.row)"
+                  v-hasPermi="configPermi.release"
+                >{{ scope.row.status == 1 ? '启用' : '禁用' }}</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="configPermi.edit"
+                >修改</el-button>
+                <el-button
+                  v-if="scope.row.status == 1"
+                  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" />
+    </div>
+  </template>
+  
+  <script>
+  import { 
+    listTableApi, 
+    delTableParamsApi, 
+    publicByPutApi as releaseApi
+    } from "@/api/CURD";
+  import addAndEdit from "../formBox/attractionInfoCultureForm.vue"
+  export default {
+    name: "User",
+    dicts: ['tourism_attractionInfoIntroduce_status'],
+    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']
+        },
+        configUrl: {
+          list: '/merchant/merchantDetail/pageList', // 列表地址
+          delect: '/merchant/merchantDetail/deleteById', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
+          release: '/merchant/merchantDetail/updateStatus',// 发布接口
+        },
+        // 遮罩层
+        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: 2, label: `摘要`, visible: true },
+          { key: 3, label: `创建人`, visible: true },
+          { key: 4, label: `创建时间`, visible: true },
+          { key: 5, label: `状态`, visible: true },
+        ],
+      };
+    },
+    methods: {
+        initData() {
+            this.getList();
+        },
+      /** 查询用户列表 */
+      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,type: 2}, 
+            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.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,
+            type: 1
+          });
+        }).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
+          })
+        }
+      },
+      /** 发布  */
+      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/contentManagement/tabelBox/attractionInfoIntroduce.vue

@@ -77,7 +77,7 @@
             <el-table-column type="index" label="序号" align="center"  />
             <el-table-column label="标题" align="center" key="titleName" prop="titleName" v-if="columns[0].visible">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.name" placement="top">
+                <el-tooltip class="item" effect="dark" :content="scope.row.titleName" 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.titleName }}</span>
                   </div>
@@ -86,7 +86,7 @@
             </el-table-column>
             <el-table-column label="摘要" align="center" key="contentMain" prop="contentMain" v-if="columns[1].visible">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.name" placement="top">
+                <el-tooltip class="item" effect="dark" :content="scope.row.contentMain" 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.contentMain }}</span>
                   </div>
@@ -122,6 +122,7 @@
                   v-hasPermi="configPermi.edit"
                 >修改</el-button>
                 <el-button
+                  v-if="scope.row.status == 1"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
@@ -178,7 +179,7 @@
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
-          release: '/merchant/advList/updateStatus',// 发布接口
+          release: '/merchant/merchantDetail/updateStatus',// 发布接口
         },
         // 遮罩层
         loading: true,
@@ -314,14 +315,14 @@
       /** 发布  */
       handleRelease(row) {
         const ids = row.id;
-        this.$modal.confirm(`是否确认${row.onlineStatus == 0 ? '上线' : '下线'}编号为"${ids}"的数据项？`).then( () => {
+        this.$modal.confirm(`是否确认${row.status == 1 ? '启用' : '禁用'}编号为"${ids}"的数据项？`).then( () => {
           return releaseApi(this.configUrl.release,{
             id: ids,
-            onlineStatus: row.onlineStatus == 0 ? 1 : 0
+            status: row.status == 1 ? 2 : 1
           });
         }).then(() => {
           this.getList();
-          this.$modal.msgSuccess(`${row.onlineStatus == 0 ? '上线' : '下线'}成功`);
+          this.$modal.msgSuccess(`${row.status == 1 ? '启用' : '禁用'}成功`);
         }).catch((e) => {
           console.error("发布失败====",e)
         });