Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/ArticleOperation/src/main/java/com/my/bigevent/pojo/Article.java

@@ -37,6 +37,7 @@ public class Article {
     private String categoryNames;
 
     private String coverImgUrl;
+    private Integer viewCount;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")

fhKeeper/formulahousekeeper/articleBackend/src/views/article/ArticleManage.vue

@@ -328,6 +328,7 @@ const deleteArticle = async (row) => {
             <el-table-column label="标签" prop="categoryNames"></el-table-column>
             <el-table-column label="发表时间" prop="createTime"> </el-table-column>
             <el-table-column label="状态" prop="state"></el-table-column>
+            <el-table-column label="预览量" prop="viewCount"></el-table-column>
             <el-table-column label="操作" width="100">
                 <template #default="{ row }">
                     <el-button :icon="Edit" circle plain type="primary" @click="editArticle(row)"></el-button>

fhKeeper/formulahousekeeper/articleBackend/vite.config.js

@@ -29,8 +29,8 @@ export default defineConfig({
     proxy:{
       '/api':{
         // target:'http://localhost:8080',  // 后台服务所在的源，用这个源替换前端服务源
-        target:'http://47.101.180.183:8091',  // 后台服务所在的源，用这个源替换前端服务源
-        // target:'http://192.168.2.17:8091',  // 后台服务所在的源，用这个源替换前端服务源
+        // target:'http://47.101.180.183:8091',  // 后台服务所在的源，用这个源替换前端服务源
+        target:'http://192.168.2.17:8091',  // 后台服务所在的源，用这个源替换前端服务源
         changeOrigin:true,     // 开启修改源
         rewrite:(path)=>path.replace(/^\/api/,'')   // url路径中的 /api 将会被替换成 '' 
       }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/css/knowledgeField.css

@@ -175,8 +175,8 @@
   position: absolute;
   font-size: 0.875rem;
   color: #7b7b7b;
-  top: 0;
-  right: 0;
+  top: 1.75rem;
+  right: 1.875rem;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-con {
   padding: 0 1.875rem 0.9375rem 1.875rem;
@@ -286,6 +286,8 @@
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList a {
   margin-bottom: 1rem;
+  display: inline-block;
+  width: 100%;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList a:last-child {
   margin-bottom: 0;

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/css/knowledgeField.less

@@ -180,8 +180,8 @@
           position: absolute;
           font-size: .875rem;
           color: #7b7b7b;
-          top: 0;
-          right: 0;
+          top: 1.75rem;
+          right: 1.875rem;
         }
       }
 
@@ -302,6 +302,8 @@
         width: 100%;
         a {
           margin-bottom: 1rem;
+          display: inline-block;
+          width: 100%;
           &:last-child {
             margin-bottom: 0;
           }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/knowledge.ftl

@@ -53,8 +53,7 @@
                     <div class="textContentTitle">${ item.title }</div>
                     <p>${ item.profile }</p>
                     <div class="textContentUnderstand">
-                      <div class="textContentUnderstandText">发布于：${item.createTimeStr}</div>
-                      <div class="textContentUnderstandText">预览量：${item.viewCount}</div>
+                      <div class="textContentUnderstandText">发布于：${item.createTimeStr} 预览量：${item.viewCount}</div>
                       <!-- <button class="linkButtonss" onclick="learnMore(${item.id})">了解详情></button> -->
                       <a class="linkButtonss" href="/articleTemplate/articleDetail?id=${item.id}">查看详情></a>
                     </div>