From 0860a8ca5f9e0d97a2c8fa9d2f7d8321f4245880 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 3 Apr 2023 17:27:02 +0800
Subject: [PATCH] fix

---
 src/pages/column/index.vue        | 6 ++----
 src/pages/overviewSetup/index.vue | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index e8d7186..86402a4 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -61,7 +61,7 @@
             </div>
           </div>
           <div class="contents">
-            <el-tree v-if="!isFilter && showNav" class="columns" ref="leftColumn" :data="columns" highlight-current :expand-on-click-node="false" default-expand-all :props="defaultProps" node-key="id" icon-class="el-icon-arrow-down" @node-click="item => columnClick(item, 1)">
+            <el-tree v-if="!isFilter && showNav && columns.length" class="columns" ref="leftColumn" :data="columns" highlight-current :expand-on-click-node="false" default-expand-all :props="defaultProps" node-key="id" icon-class="el-icon-arrow-down" @node-click="item => columnClick(item, 1)">
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span :title="node.label">{{ node.label }}</span>
               </span>
@@ -391,12 +391,10 @@ export default {
         if (this.lableId.includes(e.id)) labelName.push(e.labelName)
       })
       this.$post(this.api.newlyPublishedArticles, {
-        
-        
         siteId: this.$route.query.siteId || this.site,
         columnIds,
         pageNum: this.page,
-        pageSize: this.pageSize,
+        pageSize: this.info.pageSize,
         labelName,
         ...this.form
       }).then(({ data }) => {
diff --git a/src/pages/overviewSetup/index.vue b/src/pages/overviewSetup/index.vue
index 5b80510..6b12fa2 100644
--- a/src/pages/overviewSetup/index.vue
+++ b/src/pages/overviewSetup/index.vue
@@ -17,7 +17,7 @@
       <div class="org">
         <div class="left">
           <h6>{{ modules[1].form.title }}</h6>
-          <p class="text">{{ modules[1].form.des }}</p>
+          <p class="text" v-html="modules[1].form.des"></p>
         </div>
         <img class="pic" src="http://10.10.11.7/images/overviewSetup/1.png" alt="">
       </div>