首页 发现 帮助
注册 登录
wutt
/
manHourHousekeeper
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge remote-tracking branch 'origin/master'

yusm 6 月之前
父节点
7a17e11bfe a3f83ace78
当前提交
e45a178c38
共有 7 个文件被更改，包括 10 次插入 和 8 次删除
分列视图 显示文件统计
  1. 1 1
      fhKeeper/formulahousekeeper/articleBackend/index.html
  2. 1 1
      fhKeeper/formulahousekeeper/articleBackend/src/components/backend/TinymceEditor.vue
  3. 1 1
      fhKeeper/formulahousekeeper/articleBackend/src/views/article/ArticleManage.vue
  4. 2 2
      fhKeeper/formulahousekeeper/articleBackend/vite.config.js
  5. 2 1
      fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.css
  6. 2 1
      fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.less
  7. 1 1
      fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/knowledgeDetails.ftl

+ 1 - 1
fhKeeper/formulahousekeeper/articleBackend/index.html
查看文件 

@@ -4,7 +4,7 @@
 
     <meta charset="UTF-8">
 
     <link rel="icon" href="/favicon.ico">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <title>Vite App</title>
 
+    <title>珊瑚岛-文章管理后台</title>
 
   </head>
 
   <body>
 
     <div id="app"></div>

+ 1 - 1
fhKeeper/formulahousekeeper/articleBackend/src/components/backend/TinymceEditor.vue
查看文件 

@@ -49,7 +49,7 @@ import 'tinymce/plugins/lists'; //列表插件
 
 import 'tinymce/plugins/media'; //插入编辑媒体
 
 import 'tinymce/plugins/nonbreaking'; //插入不间断空格
 
 import 'tinymce/plugins/pagebreak'; //插入分页符
 
-import 'tinymce/plugins/preview'; //预览
 
+import 'tinymce/plugins/preview'; //浏览
 
 import 'tinymce/plugins/quickbars'; //快速工具栏
 
 import 'tinymce/plugins/save'; //保存
 
 import 'tinymce/plugins/searchreplace'; //查找替换

+ 1 - 1
fhKeeper/formulahousekeeper/articleBackend/src/views/article/ArticleManage.vue
查看文件 

@@ -328,7 +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="浏览量" 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>

+ 2 - 2
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 将会被替换成 '' 
       }

+ 2 - 1
fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.css
查看文件 

@@ -103,7 +103,8 @@
 
 }
 
 .knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item .textContent .textContentUnderstand .textContentUnderstandText img {
 
   width: 1.25rem;
 
-  padding: 0 0.875rem;
 
+  margin-left: 20px;
 
+  margin-right: 0.25rem;
 
 }
 
 .knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item .textContent p {
 
   color: #7b7b7b;

+ 2 - 1
fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.less
查看文件 

@@ -103,7 +103,8 @@
 
               align-items: center;
 
               img {
 
                 width: 1.25rem;
 
-                padding: 0 .875rem;
 
+                margin-left: 20px;
 
+                margin-right: .25rem;
 
               }
 
             }
 
           }

+ 1 - 1
fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/knowledgeDetails.ftl
查看文件 

@@ -39,7 +39,7 @@
 
       <div class="knowledgeDetails-left">
 
         <div class="knowledgeDetails-left-title">
 
           ${article.title}
 
-          <div class="previewTwo"><img src="/image/ions/previewIcon.png" />：${article.viewCount}</div>
 
+          <div class="previewTwo"><img src="/image/ions/previewIcon.png" /> ${article.viewCount}</div>
 
         </div>
 
         <div class="dividingLine"></div>
 
         <div class="knowledgeDetails-left-con">