feat: 添加知识库管理功能并更新相关配置

- 新增知识库管理页面，包含分类树和内容列表功能
- 更新微信小程序接口地址和订阅消息模板ID
- 添加tinymce和vue-tinymce-editor依赖
- 优化地图详情页图片存储逻辑
- 调整登录页面订阅消息模板配置

web/package.json

@@ -60,6 +60,7 @@
     "quill": "^1.3.7",
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",
+    "tinymce": "^8.3.0",
     "v-viewer": "^1.4.2",
     "vue": "2.6.10",
     "vue-amap": "^0.5.10",
@@ -71,6 +72,7 @@
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
+    "vue-tinymce-editor": "^1.6.2",
     "vuedraggable": "2.20.0",
     "vuex": "3.1.0",
     "wangeditor": "^3.1.1",

web/src/views/knowledge/index.vue

@@ -0,0 +1,874 @@
+<template>
+  <div class="app-container" style="height:100%;">
+    <el-row :gutter="24">
+      <!-- 左侧分类树 -->
+      <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="padding-right: 3px;">
+        <el-card class="box-card box-cardh" shadow="never" style="padding: 8px;">
+          <div class="tree-header">
+            <span class="tree-title">知识库分类</span>
+            <div class="tree-actions">
+              <el-button size="mini" type="primary" icon="el-icon-plus" @click="addCategory">添加</el-button>
+            </div>
+          </div>
+          <el-scrollbar style="height: calc(100% - 50px);">
+            <el-tree
+              ref="categoryTreeRef"
+              v-loading="loading1"
+              element-loading-text="数据加载中"
+              element-loading-spinner="el-icon-loading"
+              class="filter-tree"
+              :data="categoryTree"
+              :props="defaultProps"
+              default-expand-all
+              highlight-current
+              node-key="id"
+              @node-click="handleCategoryClick"
+            >
+              <span slot-scope="{ node, data }" class="custom-tree-node">
+                <span>{{ node.label }}</span>
+                <span>
+                  <el-button type="text" size="mini" icon="el-icon-edit" @click.stop="editCategory(data)" />
+                  <el-button type="text" size="mini" icon="el-icon-delete" @click.stop="deleteCategory(data)" />
+                </span>
+              </span>
+            </el-tree>
+          </el-scrollbar>
+        </el-card>
+      </el-col>
+      <!-- 右侧内容列表 -->
+      <el-col :xs="24" :sm="24" :md="18" :lg="18" :xl="18" style="padding-left: 3px;">
+        <el-card class="box-card box-cardh map-container" shadow="never" style="overflow:auto;">
+          <!-- 工具栏 -->
+          <div class="toolbar">
+            <el-input
+              v-model="searchKeyword"
+              placeholder="请输入关键词搜索"
+              prefix-icon="el-icon-search"
+              style="width: 300px; margin-right: 10px;"
+            />
+            <el-button type="primary" icon="el-icon-search" @click="searchContent">搜索</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="addContent">新增知识</el-button>
+          </div>
+          <!-- 表格渲染 -->
+          <el-table
+            v-loading="loading2"
+            element-loading-text="数据加载中"
+            element-loading-spinner="el-icon-loading"
+            :data="contentList"
+            style="width: 100%;"
+          >
+            <el-table-column type="selection" width="55" />
+            <el-table-column prop="title" label="标题" show-overflow-tooltip min-width="200" />
+            <el-table-column prop="categoryName" label="分类" width="150" />
+            <el-table-column prop="createdAt" label="创建时间" width="180" />
+            <el-table-column prop="updatedAt" label="更新时间" width="180" />
+            <el-table-column label="操作" width="200" align="center" fixed="right">
+              <template slot-scope="scope">
+                <el-button-group>
+                  <el-button size="mini" type="primary" icon="el-icon-view" @click="viewContent(scope.row)">查看</el-button>
+                  <el-button size="mini" type="success" icon="el-icon-edit" @click="editContent(scope.row)">编辑</el-button>
+                  <el-button size="mini" type="danger" icon="el-icon-delete" @click="deleteContent(scope.row)">删除</el-button>
+                </el-button-group>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!-- 分页组件 -->
+          <div class="pagination-container">
+            <el-pagination
+              :current-page="page.current"
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="page.size"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+            />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 分类编辑对话框 -->
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :title="categoryDialog.title"
+      :visible.sync="categoryDialog.visible"
+      width="40%"
+    >
+      <el-form
+        ref="categoryFormRef"
+        :model="categoryForm"
+        label-width="80px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="分类名称" prop="categoryName" :rules="[{ required: true, message: '请输入分类名称', trigger: 'blur' }]">
+          <el-input v-model="categoryForm.categoryName" placeholder="请输入分类名称" />
+        </el-form-item>
+        <el-form-item label="上级分类">
+          <el-select v-model="categoryForm.parentId" placeholder="请选择上级分类">
+            <el-option label="根分类" :value="0" />
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.id"
+              :label="item.label"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分类描述">
+          <el-input v-model="categoryForm.description" type="textarea" placeholder="请输入分类描述" :rows="3" />
+        </el-form-item>
+        <el-form-item label="是否启用">
+          <el-switch v-model="categoryForm.isActive" :active-value="true" :inactive-value="false" active-color="#13ce66" inactive-color="#ff4949" />
+        </el-form-item>
+        <el-form-item label="排序号">
+          <el-input-number v-model="categoryForm.sortOrder" :min="0" :step="1" placeholder="请输入排序号" />
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="categoryDialog.visible = false">取消</el-button>
+        <el-button type="primary" @click="saveCategory">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 内容编辑对话框 -->
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :title="contentDialog.title"
+      :visible.sync="contentDialog.visible"
+      width="70%"
+    >
+      <el-scrollbar class="editbox-cardh" style="height: 600px;">
+        <el-form
+          ref="contentFormRef"
+          :model="contentForm"
+          label-width="80px"
+          class="demo-ruleForm"
+        >
+          <el-form-item label="所属分类" prop="categoryId" :rules="[{ required: true, message: '请选择所属分类', trigger: 'change' }]">
+            <el-select v-model="contentForm.categoryId" placeholder="请选择所属分类">
+              <el-option
+                v-for="item in categoryOptions"
+                :key="item.id"
+                :label="item.label"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标题" prop="title" :rules="[{ required: true, message: '请输入标题', trigger: 'blur' }]">
+            <el-input v-model="contentForm.title" placeholder="请输入标题" maxlength="200" />
+          </el-form-item>
+          <el-form-item label="内容" prop="content" :rules="[{ required: true, message: '请输入内容', trigger: 'blur' }]">
+            <div ref="editorRef" class="editor-container" />
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeContentDialog">取消</el-button>
+        <el-button type="primary" @click="saveContent">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 内容查看对话框 -->
+    <el-dialog
+      append-to-body
+      :title="'查看知识 - ' + viewContentForm.title"
+      :visible.sync="viewContentDialogVisible"
+      width="70%"
+    >
+      <el-scrollbar class="editbox-cardh" style="height: 600px;">
+        <div class="view-content">
+          <div class="view-title">{{ viewContentForm.title }}</div>
+          <div class="view-meta">
+            <span class="meta-item">所属分类：{{ viewContentForm.categoryName }}</span>
+            <span class="meta-item">创建时间：{{ viewContentForm.createTime }}</span>
+            <span class="meta-item">更新时间：{{ viewContentForm.updateTime }}</span>
+          </div>
+          <div class="view-body" v-html="viewContentForm.content" />
+          <div v-if="viewContentForm.remark" class="view-remark">
+            <strong>备注：</strong>{{ viewContentForm.remark }}
+          </div>
+        </div>
+      </el-scrollbar>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="viewContentDialogVisible = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { upload } from '@/utils/upload'
+import E from 'wangeditor'
+import request from '@/utils/request'
+
+export default {
+  name: 'KnowledgeBase',
+  data() {
+    return {
+      // 分类树相关
+      categoryTree: [],
+      defaultProps: {
+        children: 'children',
+        label: 'categoryName'
+      },
+      categoryOptions: [],
+      loading1: false,
+      currentCategoryId: 0,
+
+      // 内容列表相关
+      contentList: [],
+      loading2: false,
+      searchKeyword: '',
+      page: {
+        current: 1,
+        size: 10
+      },
+      total: 0,
+
+      // 分类对话框
+      categoryDialog: {
+        visible: false,
+        title: '添加分类'
+      },
+      categoryForm: {
+        id: '',
+        name: '',
+        parentId: '0',
+        remark: ''
+      },
+
+      // 内容对话框
+      contentDialog: {
+        visible: false,
+        title: '添加知识'
+      },
+      contentForm: {
+        id: '',
+        categoryId: '',
+        title: '',
+        content: '',
+        remark: ''
+      },
+
+      // 查看对话框
+      viewContentDialogVisible: false,
+      viewContentForm: {
+        id: '',
+        title: '',
+        categoryName: '',
+        content: '',
+        createTime: '',
+        updateTime: '',
+        remark: ''
+      },
+
+      // 富文本编辑器
+      editor: null
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'imagesUploadApi',
+      'baseApi'
+    ])
+  },
+  created() {
+    this.loadCategoryTree()
+    this.loadContentList()
+  },
+  mounted() {
+    // 初始化编辑器
+    this.$nextTick(() => {
+      this.initEditor()
+    })
+  },
+  beforeDestroy() {
+    if (this.editor) {
+      this.editor.destroy()
+    }
+  },
+  methods: {
+    // 初始化富文本编辑器
+    initEditor() {
+      if (this.$refs.editorRef) {
+        const _this = this
+        this.editor = new E(this.$refs.editorRef)
+        // 自定义菜单配置
+        this.editor.customConfig.zIndex = 10
+        // 文件上传
+        this.editor.customConfig.customUploadImg = function(files, insert) {
+          files.forEach(image => {
+            upload(_this.imagesUploadApi, image).then(res => {
+              const data = res.data
+              const url = _this.baseApi + '/file/' + data.type + '/' + data.realName
+              insert(url)
+            })
+          })
+        }
+        this.editor.customConfig.onchange = (html) => {
+          _this.contentForm.content = html
+        }
+        this.editor.create()
+        // 初始化数据 - 直接使用contentForm.content，因为接口返回的就是HTML格式
+        this.editor.txt.html(this.contentForm.content || '')
+      }
+    },
+
+    // 加载分类树
+    loadCategoryTree() {
+      this.loading1 = true
+      // 调用真实接口获取分类列表
+      request({
+        url: '/knowledge-category/selectKnowledgeCategoryList',
+        method: 'get'
+      })
+        .then(res => {
+          this.loading1 = false
+          if (res.status === 200 && res.data) {
+            // 将扁平数据转换为树形结构
+            this.categoryTree = this.buildCategoryTree(res.data)
+            this.generateCategoryOptions()
+          } else {
+            this.$message.error(res.message || '加载分类失败')
+          }
+        })
+        .catch(err => {
+          this.loading1 = false
+          this.$message.error(err || '加载分类失败')
+        })
+    },
+
+    // 将扁平数据转换为树形结构
+    buildCategoryTree(data) {
+      const tree = []
+      const map = {}
+
+      // 构建ID映射
+      data.forEach(item => {
+        map[item.id] = {
+          ...item,
+          children: []
+        }
+      })
+
+      // 构建树形结构
+      data.forEach(item => {
+        const parentId = item.parentId || 0
+        if (parentId === 0) {
+          // 顶级分类
+          tree.push(map[item.id])
+        } else {
+          // 子分类
+          if (map[parentId]) {
+            map[parentId].children.push(map[item.id])
+          }
+        }
+      })
+
+      return tree
+    },
+
+    // 生成分类选项（用于下拉选择）
+    generateCategoryOptions() {
+      const options = []
+      const generateOptions = (tree, level = 0, prefix = '') => {
+        tree.forEach(node => {
+          const label = level > 0 ? prefix + node.categoryName : node.categoryName
+          options.push({ id: node.id, label })
+          if (node.children && node.children.length > 0) {
+            generateOptions(node.children, level + 1, prefix + '└─')
+          }
+        })
+      }
+      generateOptions(this.categoryTree)
+      this.categoryOptions = options
+    },
+
+    // 加载内容列表
+    loadContentList() {
+      this.loading2 = true
+      // 调用真实接口获取知识库内容列表 - 使用POST请求，参数放到body中
+      request({
+        url: '/knowledge-base/selectKnowledgeBaseList',
+        method: 'post',
+        data: {
+          current: this.page.current,
+          size: this.page.size,
+          categoryId: this.currentCategoryId || undefined,
+          title: this.searchKeyword || undefined
+        }
+      })
+        .then(res => {
+          this.loading2 = false
+          if (res.status === 200 && res.data && res.data.data) {
+            // 获取原始数据
+            const rawData = res.data.data || []
+            // 为每条数据添加分类名称并解码HTML内容
+            this.contentList = rawData.map(item => ({
+              ...item,
+              // 根据categoryId获取分类名称
+              categoryName: this.getCategoryNameById(item.categoryId),
+              // 解码HTML内容
+              content: item.content ? this.decodeHtml(item.content) : ''
+            }))
+            this.total = res.data.total || 0
+          } else {
+            this.$message.error(res.message || '加载内容失败')
+          }
+        })
+        .catch(err => {
+          this.loading2 = false
+          this.$message.error(err || '加载内容失败')
+        })
+    },
+
+    // 根据分类ID获取分类名称
+    getCategoryNameById(categoryId) {
+      if (!categoryId) return ''
+
+      // 递归查找分类名称
+      const findCategory = (tree) => {
+        for (const node of tree) {
+          if (node.id === categoryId) {
+            return node.categoryName
+          }
+          if (node.children && node.children.length > 0) {
+            const result = findCategory(node.children)
+            if (result) {
+              return result
+            }
+          }
+        }
+        return ''
+      }
+
+      return findCategory(this.categoryTree)
+    },
+
+    // HTML实体解码
+    decodeHtml(html) {
+      if (!html) return ''
+      // 使用更可靠的HTML实体解码方式
+      const entities = {
+        '&amp;': '&',
+        '&lt;': '<',
+        '&gt;': '>',
+        '&quot;': '"',
+        '&#39;': "'",
+        '&#x2F;': '/',
+        '&#x60;': '`',
+        '&#x3D;': '='
+      }
+      return html.replace(/&[#\w]+;/g, match => entities[match] || match)
+    },
+
+    // 分类点击事件
+    handleCategoryClick(data) {
+      this.currentCategoryId = data.id
+      this.page.current = 1
+      this.loadContentList()
+    },
+
+    // 添加分类
+    addCategory() {
+      this.categoryDialog.title = '添加分类'
+      this.categoryForm = {
+        id: '',
+        categoryName: '',
+        parentId: this.currentCategoryId || 0,
+        description: '',
+        isActive: true,
+        sortOrder: 0
+      }
+      this.categoryDialog.visible = true
+    },
+
+    // 编辑分类
+    editCategory(data) {
+      this.categoryDialog.title = '编辑分类'
+      this.categoryForm = {
+        id: data.id,
+        categoryName: data.categoryName,
+        parentId: data.parentId || 0,
+        description: data.description || '',
+        isActive: data.isActive || true,
+        sortOrder: data.sortOrder || 0
+      }
+      this.categoryDialog.visible = true
+    },
+
+    // 删除分类
+    deleteCategory(data) {
+      this.$confirm('确定要删除该分类吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: `/knowledge-category/deleteKnowledgeCategory/${data.id}`,
+          method: 'delete'
+        })
+          .then(res => {
+            if (res.status === 200) {
+              this.$message.success('删除成功')
+              this.loadCategoryTree()
+            } else {
+              this.$message.error(res.message || '删除失败')
+            }
+          })
+          .catch(err => {
+            this.$message.error(err || '删除失败')
+          })
+      }).catch(() => {
+        // 取消删除
+      })
+    },
+
+    // 保存分类
+    saveCategory() {
+      this.$refs.categoryFormRef.validate((valid) => {
+        if (valid) {
+          const formData = { ...this.categoryForm }
+
+          // 根据是否有ID判断是添加还是修改
+          if (formData.id) {
+            // 修改分类 - 使用POST请求
+            request({
+              url: '/knowledge-category/updateKnowledgeCategory',
+              method: 'post',
+              data: formData
+            })
+              .then(res => {
+                if (res.status === 200) {
+                  this.$message.success('修改成功')
+                  this.categoryDialog.visible = false
+                  this.loadCategoryTree()
+                } else {
+                  this.$message.error(res.message || '修改失败')
+                }
+              })
+              .catch(err => {
+                this.$message.error(err || '修改失败')
+              })
+          } else {
+            // 添加分类 - 使用POST请求，参数放到body中
+            request({
+              url: '/knowledge-category/addKnowledgeCategory',
+              method: 'post',
+              data: formData
+            })
+              .then(res => {
+                if (res.status === 200) {
+                  this.$message.success('添加成功')
+                  this.categoryDialog.visible = false
+                  this.loadCategoryTree()
+                } else {
+                  this.$message.error(res.message || '添加失败')
+                }
+              })
+              .catch(err => {
+                this.$message.error(err || '添加失败')
+              })
+          }
+        }
+      })
+    },
+
+    // 添加知识
+    addContent() {
+      this.contentDialog.title = '添加知识'
+      this.contentForm = {
+        id: '',
+        categoryId: this.currentCategoryId || 0,
+        title: '',
+        content: ''
+      }
+      this.contentDialog.visible = true
+      this.$nextTick(() => {
+        this.initEditor()
+      })
+    },
+
+    // 编辑知识
+    editContent(row) {
+      this.contentDialog.title = '编辑知识'
+      // 调用详情接口获取完整数据
+      request({
+        url: `/knowledge-base/selectKnowledgeBaseDetail/${row.id}`,
+        method: 'get'
+      })
+        .then(res => {
+          if (res.status === 200) {
+            // 处理接口返回的内容字段，需要解码HTML实体
+            const rawContent = res.data && res.data.content ? res.data.content : ''
+            const decodedContent = this.decodeHtml(rawContent)
+
+            this.contentForm = {
+              id: res.data && res.data.id ? res.data.id : '',
+              categoryId: res.data && res.data.categoryId ? res.data.categoryId : 0,
+              title: res.data && res.data.title ? res.data.title : '',
+              content: decodedContent
+            }
+            this.contentDialog.visible = true
+            this.$nextTick(() => {
+              this.initEditor()
+            })
+          } else {
+            this.$message.error(res.message || '获取详情失败')
+          }
+        })
+        .catch(err => {
+          this.$message.error(err || '获取详情失败')
+        })
+    },
+
+    // 查看知识
+    viewContent(row) {
+      // 调用详情接口获取完整数据
+      request({
+        url: `/knowledge-base/selectKnowledgeBaseDetail/${row.id}`,
+        method: 'get'
+      })
+        .then(res => {
+          if (res.status === 200) {
+            // 处理接口返回的内容字段，需要解码HTML实体
+            const rawContent = res.data && res.data.content ? res.data.content : ''
+            const decodedContent = this.decodeHtml(rawContent)
+            const categoryId = res.data && res.data.categoryId ? res.data.categoryId : 0
+
+            this.viewContentForm = {
+              id: res.data && res.data.id ? res.data.id : '',
+              title: res.data && res.data.title ? res.data.title : '',
+              categoryName: this.getCategoryNameById(categoryId) || '', // 从分类树中查找分类名称
+              content: decodedContent,
+              createTime: res.data && res.data.createdAt ? res.data.createdAt : '',
+              updateTime: res.data && res.data.updatedAt ? res.data.updatedAt : '',
+              remark: '' // 接口中没有remark字段
+            }
+            this.viewContentDialogVisible = true
+          } else {
+            this.$message.error(res.message || '获取详情失败')
+          }
+        })
+        .catch(err => {
+          this.$message.error(err || '获取详情失败')
+        })
+    },
+
+    // 删除知识
+    deleteContent(row) {
+      this.$confirm('确定要删除该知识吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 调用真实删除接口
+        request({
+          url: `/knowledge-base/deleteKnowledgeBase/${row.id}`,
+          method: 'delete'
+        })
+          .then(res => {
+            if (res.status === 200) {
+              this.$message.success('删除成功')
+              this.loadContentList()
+            } else {
+              this.$message.error(res.message || '删除失败')
+            }
+          })
+          .catch(err => {
+            this.$message.error(err || '删除失败')
+          })
+      }).catch(() => {
+        // 取消删除
+      })
+    },
+
+    // 关闭内容对话框
+    closeContentDialog() {
+      this.contentDialog.visible = false
+    },
+
+    // 保存知识
+    saveContent() {
+      // 先获取编辑器内容
+      if (this.editor) {
+        this.contentForm.content = this.editor.txt.html()
+      }
+
+      this.$refs.contentFormRef.validate((valid) => {
+        if (valid) {
+          const formData = { ...this.contentForm }
+
+          // 根据是否有ID判断是添加还是修改
+          if (formData.id) {
+            // 修改知识 - 使用POST请求
+            request({
+              url: '/knowledge-base/updateKnowledgeBase',
+              method: 'post',
+              data: formData
+            })
+              .then(res => {
+                if (res.status === 200) {
+                  this.$message.success('修改成功')
+                  this.contentDialog.visible = false
+                  this.loadContentList()
+                } else {
+                  this.$message.error(res.message || '修改失败')
+                }
+              })
+              .catch(err => {
+                this.$message.error(err || '修改失败')
+              })
+          } else {
+            // 添加知识 - 使用POST请求
+            request({
+              url: '/knowledge-base/addKnowledgeBase',
+              method: 'post',
+              data: formData
+            })
+              .then(res => {
+                if (res.status === 200) {
+                  this.$message.success('添加成功')
+                  this.contentDialog.visible = false
+                  this.loadContentList()
+                } else {
+                  this.$message.error(res.message || '添加失败')
+                }
+              })
+              .catch(err => {
+                this.$message.error(err || '添加失败')
+              })
+          }
+        }
+      })
+    },
+
+    // 搜索内容
+    searchContent() {
+      this.page.current = 1
+      this.loadContentList()
+    },
+
+    // 分页大小变化
+    handleSizeChange(val) {
+      this.page.size = val
+      this.loadContentList()
+    },
+
+    // 分页当前页变化
+    handleCurrentChange(val) {
+      this.page.current = val
+      this.loadContentList()
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.tree-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10px 10px;
+  border-bottom: 1px solid #eee;
+  margin-bottom: 10px;
+
+  .tree-title {
+    font-size: 16px;
+    font-weight: bold;
+  }
+}
+
+.toolbar {
+  display: flex;
+  align-items: center;
+  padding: 10px 0;
+  margin-bottom: 10px;
+}
+
+.pagination-container {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding: 15px 0;
+}
+
+.view-content {
+  padding: 10px;
+
+  .view-title {
+    font-size: 20px;
+    font-weight: bold;
+    margin-bottom: 15px;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #eee;
+  }
+
+  .view-meta {
+    margin-bottom: 20px;
+    color: #666;
+    font-size: 14px;
+
+    .meta-item {
+      margin-right: 20px;
+    }
+  }
+
+  .view-body {
+    margin-bottom: 20px;
+    line-height: 1.8;
+  }
+
+  .view-remark {
+    padding: 10px;
+    background-color: #f5f7fa;
+    border-radius: 4px;
+    color: #666;
+  }
+}
+
+.editor-container {
+  min-height: 400px;
+}
+
+::v-deep .w-e-text-container {
+  height: 400px !important;
+}
+
+.el-card__body {
+  padding: 0px;
+  height: 100%;
+}
+
+.box-cardh {
+  height: calc(100vh - 170px);
+}
+
+.editbox-cardh {
+  height: calc(100vh - 250px);
+}
+
+.el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+
+.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+  background-color: #e7faf0;
+}
+</style>

wxproject/app.js

@@ -5,8 +5,8 @@ App({
   globalData: {
     userInfo: null,
     httpsUrl: 'https://cgdl.yutingcn.com/',
-    // httpsUrlServer: 'http://39.164.159.226:9090', //个人接口地址
-    httpsUrlServer:'http://zhyh.hnyulin.com/api/',
+    httpsUrlServer: 'http://39.164.159.226:9090', //个人接口地址
+    // httpsUrlServer:'http://zhyh.hnyulin.com/api/',
     zdzUrlServer:'http://58.246.189.90:30000', //市指导站推送测试接口地址
     openId: '',
     token: '',

wxproject/greenland/pages/inspectionDetail/inspectionDetail.js

@@ -173,7 +173,12 @@ Page({
     ////console.log("跳转路径",e)
     let url = e.currentTarget.dataset.url;
     let remark = e.currentTarget.dataset.remark;
+    console.log(e.currentTarget.dataset.images, 'e.currentTarget.dataset.images');
     let images = JSON.stringify(e.currentTarget.dataset.images);
+
+    const key = 'detailMapInfo';
+    wx.setStorageSync(key, images)
+
     wx.navigateTo({
       url:
         // "/packageA/pages/historicalTrackDetailMap/historicalTrackDetailMap?url=" +

wxproject/greenland/pages/inspectionDetailMap/inspectionDetailMap.js

@@ -43,8 +43,12 @@ Page({
       that.marksDots1()
     } else {
       console.log("2")
+      console.log(options.images, 'options.images');
 
-      let images = JSON.parse(options.images)
+      const key = 'detailMapInfo';
+    
+
+      let images = wx.getStorageInfo(key)
       let arr = options.url.split(",")
       let LineArr = options.dates.split(";")
       let arr1 = []

wxproject/pages/login/login.js

@@ -267,7 +267,7 @@ Page({
                 },
               })
               wx.requestSubscribeMessage({
-                tmplIds: ["dnyWG_8ZFgueG1ioYJd8-PLT2LGVqYPVatlVs3OLVGI"],
+                tmplIds: ["9k7_suAIzYn4zbC7hdOegpeNoWFpmOisq57Coh_ISrs", "zlr8Ce3V9yB3S--v6kNnp8W66a2fQO7uG-LTbPRwgdE"],
                 success(res) {
                   console.log(res, '订阅消息成功')
                   if (res.errMsg == "requestSubscribeMessage:ok") {