1. 完善

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

@@ -278,7 +278,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/noticeManagementForm.vue

@@ -0,0 +1,381 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="70%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    element-loading-text="拼命加载数据中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+        <el-form-item label="协议类型" prop="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">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
+        {{ loading ? '提交中...' : '保存' }}
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+import { quillEditor } from 'vue-quill-editor'
+ 
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_noticemanagement_type'],
+  components: {quillEditor},
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/agreementInfo/insertOrUpdate', // 新增地址
+        details: '/merchant/agreementInfo/selectById', // 详情地址
+        edit: '/merchant/agreementInfo/insertOrUpdate', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        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.loading = true
+      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 = {
+          ...row
+        }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("新增失败!!!");
+              this.loading = false
+            })
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    // 失去焦点事件
+    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>
+
+<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/questionsForm.vue

@@ -13,45 +13,12 @@
     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">
-        <div class="form-title"><span>基本信息</span></div>
         <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="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>
-          <span>建议上传xxx*xxx,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
-        </el-form-item>
-        <div class="form-title"><span>基本信息</span></div>
-        <el-form-item label-width="70px" label="内容：" prop="detail">
-        </el-form-item>
-        <div>
+        <el-form-item label="摘要：" prop="content">
           <quill-editor
-              v-model="form.detail"
+              v-model="form.content"
               ref="myQuillEditor"
               :options="editorOption"
               @blur="onEditorBlur($event)"
@@ -59,7 +26,7 @@
               @change="onEditorChange($event)"
               @ready="onEditorReady($event)">
           </quill-editor>
-        </div>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer" v-if="formStatus==1">
@@ -93,7 +60,7 @@ import 'quill/dist/quill.bubble.css'
 
 export default {
   name: "addAndEdit",
-  dicts: ['tourism_online_status','tourism_online_type'],
+  dicts: [],
   components: {quillEditor},
   data() {
     return {
@@ -103,17 +70,16 @@ export default {
       loading: false,
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/question/insertOrUpdate', // 新增地址
-        details: '/merchant/merchantIntroduction/selectById', // 详情地址
-        edit: '/merchant/question/insertOrUpdate', // 编辑地址
+        add: '/system/question/insertOrUpdate', // 新增地址
+        details: '/system/merchantIntroduction/selectById', // 详情地址
+        edit: '/system/question/insertOrUpdate', // 编辑地址
       },
       form: {
         id: undefined,
       },
       rules: {
         title: [{ required: true, message: "请输入标题名称", trigger: ["change","blur"] }],
-        detail: [{ required: true, message: "请输入内容", trigger: ["change","blur"] }],
-        imgUrl: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
+        content: [{ required: true, message: "请输入摘要", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
       // 富文本编辑器配置
@@ -139,9 +105,6 @@ export default {
         placeholder: '请输入正文'
       },
 
-      //  上传文件
-      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
-      actionUrlLoading: false,
     };
   },
   methods: {
@@ -149,7 +112,6 @@ export default {
       this.title = title
       this.open = true
       this.loading = true
-      this.actionUrlLoading = false
       this.model = model
       this.formStatus = 0
       if(model=='ADD') { // 新增
@@ -269,40 +231,8 @@ export default {
     // 内容改变事件
     onEditorChange({ quill, html, text }) {
       console.log('editor change!', quill, html, text)
-      this.form.noticeContent = html
+      this.form.content = html
     },
-
-
-    /**  上传图片  */
-    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 < 2;
-      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>

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

@@ -269,7 +269,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,
+        beginTime: 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

@@ -13,6 +13,16 @@
               @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>
@@ -30,46 +40,31 @@
               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="title" prop="title" v-if="columns[0].visible" />
-          <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="releaseBy" prop="releaseBy" v-if="columns[2].visible" width="120" />
-          <el-table-column label="发布日期" align="center" key="releaseBy" prop="releaseBy" v-if="columns[3].visible" width="120" />
+          <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"
@@ -77,14 +72,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"
@@ -112,13 +99,8 @@
         />
       </el-col>
     </el-row>
-
-    <!--  导入  -->
-    <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
     <!--  新增或修改  -->
     <addAndEdit ref="addAndEdit" @refresh="getList" />
-    <!--  详情  -->
-    <detailsBox ref="detailsBox" @refresh="getList" />
   </div>
 </template>
 
@@ -128,14 +110,13 @@ import {
   delTableParamsApi, 
   } from "@/api/CURD";
 import addAndEdit from "./formBox/questionsForm.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'], // 详情权限
@@ -145,8 +126,8 @@ export default {
         export: ['system:user:export'],// 导出权限
       },
       configUrl: {
-        list: '/merchant/question/pageList', // 列表地址
-        delect: '/merchant/question/deleteById', // 删除地址
+        list: '/system/question/pageList', // 列表地址
+        delect: '/system/question/deleteById', // 删除地址
         upload: '',// 导入地址
         download:'', // 下载模板地址
         export: '',// 导出地址
@@ -173,10 +154,10 @@ export default {
       dateRange: [],
       // 控制列表是否显示
       columns: [
-        { key: 0, label: `标题名称`, visible: true },
-        { key: 2, label: `发布时间`, visible: true },
-        { key: 3, label: `上/下架状态`, visible: true },
-        { key: 4, label: `发布人`, visible: true },
+        { key: 0, label: `标题`, visible: true },
+        { key: 2, label: `摘要`, visible: true },
+        { key: 3, label: `发布人员`, visible: true },
+        { key: 4, label: `发布时间`, visible: true },
       ],
     };
   },
@@ -187,10 +168,16 @@ export default {
     /** 查询用户列表 */
     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(
-          this.queryParams, 
+          params, 
           this.dateRange)).then(response => {
             this.tableList = response.data.rows;
             this.total = response.data.total;
@@ -232,7 +219,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       if(this.$refs.addAndEdit) {
-        this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDIT",{...row})
       }
     },
     handleDetails(row){
@@ -243,7 +230,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
         });

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

@@ -123,13 +123,8 @@
         />
       </el-col>
     </el-row>
-
-    <!--  导入  -->
-    <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
     <!--  新增或修改  -->
     <addAndEdit ref="addAndEdit" @refresh="getList" />
-    <!--  详情  -->
-    <detailsBox ref="detailsBox" @refresh="getList" />
   </div>
 </template>
 
@@ -140,14 +135,13 @@ import {
   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'], // 详情权限