Merge branch 'master' of http://39.164.159.226:3000/hnsh-smart-steward/smart-steward-mobile

src/api/knowledge/index.ts

@@ -2,9 +2,41 @@ import { http } from '@/http/http'
 enum Api {
   baseknowledgeCategory = '/knowledgeCategory/category',
   queryknowledgeCategory = '/knowledgeCategory/category/list',
+  queryknowledgeTableContents = '/knowledgeContent/content/list',
+  baseknowledgeContent = '/knowledgeContent/content',
+  querycomment = '/commComments/comments/list',
+  baseaddcomment = '/commComments/comments',
+  queryrecord = '/knowledgeViewRecord/record/list',
+  queryrecentviewlist = '/knowledgeContent/content/getRecentRecords',
 }
 
 //查询知识库分类列表
 export function queryKnowledgeCategory(params: any) {
   return http.get(Api.queryknowledgeCategory, params)
 }
+//获取知识库内容目录列表
+export function queryKnowledgeContentlist({ categoryId }) {
+  return http.get(`${Api.queryknowledgeTableContents}/${categoryId}`)
+}
+//获取知识库内容详细信息
+export function getKnowledgeContentDetail({ roleId }) {
+  return http.get(`${Api.baseknowledgeContent}/${roleId}`)
+}
+//获取评论列表
+export function querycomment({ targetId, targetType }: any) {
+  return http.get(
+    `${Api.querycomment}?targetId=${targetId}&targetType=${targetType}`
+  )
+}
+//新增 提交评论
+export function addComment(data: any) {
+  return http.post(Api.baseaddcomment, data)
+}
+//查看记录
+export function queryrecord(params: any) {
+  return http.get(Api.queryrecord, params);
+}
+//最近查看列表
+export function queryrecentviewlistAPI(params: any) {
+  return http.get(Api.queryrecentviewlist, params);
+}

src/api/workorder/index.ts

@@ -6,6 +6,8 @@ enum Api {
   queryrtodoaskslist = '/scheduleTasks/tasks/allList',
   postList = '/system/post/list',
   querybaseApi = '/taskTemplate/template/list',
+  menuList = '/system/user/list',
+  selectAllSysStation = '/sysStation/station/selectAllSysStationList',
 }
 // 查询加油站列表
 export function queryGasStationList(params: any) {
@@ -32,6 +34,11 @@ export function addtodoaskslist(data: any) {
 export function querybaseApilist(params?: any) {
   return http.get(Api.querybaseApi, params)
 }
-// export function login(loginForm: ILoginForm) {
-//   return http.post<IAuthLoginRes>('/login', loginForm)
-// }
+//抄送人列表
+export function queryrCCList() {
+  return http.get(Api.menuList)
+}
+//查询所有油站
+export function selectAllSysStation() {
+  return http.get(Api.selectAllSysStation, { isAll: true })
+}

src/assets/font/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

src/assets/font/demo_index.html

@@ -0,0 +1,690 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xf00a1;</span>
+                <div class="name">图书</div>
+                <div class="code-name">&amp;#xf00a1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe627;</span>
+                <div class="name">列表</div>
+                <div class="code-name">&amp;#xe627;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6ce;</span>
+                <div class="name">笔记</div>
+                <div class="code-name">&amp;#xe6ce;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6cf;</span>
+                <div class="name">发现</div>
+                <div class="code-name">&amp;#xe6cf;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d0;</span>
+                <div class="name">会员</div>
+                <div class="code-name">&amp;#xe6d0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d1;</span>
+                <div class="name">共享群</div>
+                <div class="code-name">&amp;#xe6d1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d2;</span>
+                <div class="name">视频</div>
+                <div class="code-name">&amp;#xe6d2;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d3;</span>
+                <div class="name">识字</div>
+                <div class="code-name">&amp;#xe6d3;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d4;</span>
+                <div class="name">签到</div>
+                <div class="code-name">&amp;#xe6d4;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d5;</span>
+                <div class="name">备份</div>
+                <div class="code-name">&amp;#xe6d5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d6;</span>
+                <div class="name">服务</div>
+                <div class="code-name">&amp;#xe6d6;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d7;</span>
+                <div class="name">圈子</div>
+                <div class="code-name">&amp;#xe6d7;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d8;</span>
+                <div class="name">文档</div>
+                <div class="code-name">&amp;#xe6d8;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d9;</span>
+                <div class="name">修复</div>
+                <div class="code-name">&amp;#xe6d9;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6da;</span>
+                <div class="name">云手机</div>
+                <div class="code-name">&amp;#xe6da;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6db;</span>
+                <div class="name">动态</div>
+                <div class="code-name">&amp;#xe6db;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6dc;</span>
+                <div class="name">测心理</div>
+                <div class="code-name">&amp;#xe6dc;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6dd;</span>
+                <div class="name">相册</div>
+                <div class="code-name">&amp;#xe6dd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6de;</span>
+                <div class="name">美图</div>
+                <div class="code-name">&amp;#xe6de;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6df;</span>
+                <div class="name">AI专区</div>
+                <div class="code-name">&amp;#xe6df;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6e0;</span>
+                <div class="name">自定义</div>
+                <div class="code-name">&amp;#xe6e0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6e1;</span>
+                <div class="name">智能对话</div>
+                <div class="code-name">&amp;#xe6e1;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.ttf?t=1769076349906') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tushu"></span>
+            <div class="name">
+              图书
+            </div>
+            <div class="code-name">.icon-tushu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-liebiao"></span>
+            <div class="name">
+              列表
+            </div>
+            <div class="code-name">.icon-liebiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-biji"></span>
+            <div class="name">
+              笔记
+            </div>
+            <div class="code-name">.icon-biji
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-faxian"></span>
+            <div class="name">
+              发现
+            </div>
+            <div class="code-name">.icon-faxian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-huiyuan"></span>
+            <div class="name">
+              会员
+            </div>
+            <div class="code-name">.icon-huiyuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gongxiangqun"></span>
+            <div class="name">
+              共享群
+            </div>
+            <div class="code-name">.icon-gongxiangqun
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shipin"></span>
+            <div class="name">
+              视频
+            </div>
+            <div class="code-name">.icon-shipin
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shizi"></span>
+            <div class="name">
+              识字
+            </div>
+            <div class="code-name">.icon-shizi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-qiandao"></span>
+            <div class="name">
+              签到
+            </div>
+            <div class="code-name">.icon-qiandao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-beifen"></span>
+            <div class="name">
+              备份
+            </div>
+            <div class="code-name">.icon-beifen
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fuwu"></span>
+            <div class="name">
+              服务
+            </div>
+            <div class="code-name">.icon-fuwu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-quanzi"></span>
+            <div class="name">
+              圈子
+            </div>
+            <div class="code-name">.icon-quanzi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-wendang"></span>
+            <div class="name">
+              文档
+            </div>
+            <div class="code-name">.icon-wendang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xiufu"></span>
+            <div class="name">
+              修复
+            </div>
+            <div class="code-name">.icon-xiufu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yunshouji"></span>
+            <div class="name">
+              云手机
+            </div>
+            <div class="code-name">.icon-yunshouji
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dongtai"></span>
+            <div class="name">
+              动态
+            </div>
+            <div class="code-name">.icon-dongtai
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-cexinli"></span>
+            <div class="name">
+              测心理
+            </div>
+            <div class="code-name">.icon-cexinli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xiangce"></span>
+            <div class="name">
+              相册
+            </div>
+            <div class="code-name">.icon-xiangce
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-meitu"></span>
+            <div class="name">
+              美图
+            </div>
+            <div class="code-name">.icon-meitu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-AIzhuanqu"></span>
+            <div class="name">
+              AI专区
+            </div>
+            <div class="code-name">.icon-AIzhuanqu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zidingyi"></span>
+            <div class="name">
+              自定义
+            </div>
+            <div class="code-name">.icon-zidingyi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zhinengduihua"></span>
+            <div class="name">
+              智能对话
+            </div>
+            <div class="code-name">.icon-zhinengduihua
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tushu"></use>
+                </svg>
+                <div class="name">图书</div>
+                <div class="code-name">#icon-tushu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-liebiao"></use>
+                </svg>
+                <div class="name">列表</div>
+                <div class="code-name">#icon-liebiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-biji"></use>
+                </svg>
+                <div class="name">笔记</div>
+                <div class="code-name">#icon-biji</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-faxian"></use>
+                </svg>
+                <div class="name">发现</div>
+                <div class="code-name">#icon-faxian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-huiyuan"></use>
+                </svg>
+                <div class="name">会员</div>
+                <div class="code-name">#icon-huiyuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gongxiangqun"></use>
+                </svg>
+                <div class="name">共享群</div>
+                <div class="code-name">#icon-gongxiangqun</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shipin"></use>
+                </svg>
+                <div class="name">视频</div>
+                <div class="code-name">#icon-shipin</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shizi"></use>
+                </svg>
+                <div class="name">识字</div>
+                <div class="code-name">#icon-shizi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-qiandao"></use>
+                </svg>
+                <div class="name">签到</div>
+                <div class="code-name">#icon-qiandao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-beifen"></use>
+                </svg>
+                <div class="name">备份</div>
+                <div class="code-name">#icon-beifen</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fuwu"></use>
+                </svg>
+                <div class="name">服务</div>
+                <div class="code-name">#icon-fuwu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quanzi"></use>
+                </svg>
+                <div class="name">圈子</div>
+                <div class="code-name">#icon-quanzi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wendang"></use>
+                </svg>
+                <div class="name">文档</div>
+                <div class="code-name">#icon-wendang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiufu"></use>
+                </svg>
+                <div class="name">修复</div>
+                <div class="code-name">#icon-xiufu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yunshouji"></use>
+                </svg>
+                <div class="name">云手机</div>
+                <div class="code-name">#icon-yunshouji</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dongtai"></use>
+                </svg>
+                <div class="name">动态</div>
+                <div class="code-name">#icon-dongtai</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-cexinli"></use>
+                </svg>
+                <div class="name">测心理</div>
+                <div class="code-name">#icon-cexinli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiangce"></use>
+                </svg>
+                <div class="name">相册</div>
+                <div class="code-name">#icon-xiangce</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-meitu"></use>
+                </svg>
+                <div class="name">美图</div>
+                <div class="code-name">#icon-meitu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-AIzhuanqu"></use>
+                </svg>
+                <div class="name">AI专区</div>
+                <div class="code-name">#icon-AIzhuanqu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zidingyi"></use>
+                </svg>
+                <div class="name">自定义</div>
+                <div class="code-name">#icon-zidingyi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhinengduihua"></use>
+                </svg>
+                <div class="name">智能对话</div>
+                <div class="code-name">#icon-zhinengduihua</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

src/assets/font/iconfont.css

@@ -0,0 +1,101 @@
+@font-face {
+  font-family: "iconfont"; /* Project id  */
+  src: url('iconfont.ttf?t=1769076349906') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-tushu:before {
+  content: "\f00a1";
+}
+
+.icon-liebiao:before {
+  content: "\e627";
+}
+
+.icon-biji:before {
+  content: "\e6ce";
+}
+
+.icon-faxian:before {
+  content: "\e6cf";
+}
+
+.icon-huiyuan:before {
+  content: "\e6d0";
+}
+
+.icon-gongxiangqun:before {
+  content: "\e6d1";
+}
+
+.icon-shipin:before {
+  content: "\e6d2";
+}
+
+.icon-shizi:before {
+  content: "\e6d3";
+}
+
+.icon-qiandao:before {
+  content: "\e6d4";
+}
+
+.icon-beifen:before {
+  content: "\e6d5";
+}
+
+.icon-fuwu:before {
+  content: "\e6d6";
+}
+
+.icon-quanzi:before {
+  content: "\e6d7";
+}
+
+.icon-wendang:before {
+  content: "\e6d8";
+}
+
+.icon-xiufu:before {
+  content: "\e6d9";
+}
+
+.icon-yunshouji:before {
+  content: "\e6da";
+}
+
+.icon-dongtai:before {
+  content: "\e6db";
+}
+
+.icon-cexinli:before {
+  content: "\e6dc";
+}
+
+.icon-xiangce:before {
+  content: "\e6dd";
+}
+
+.icon-meitu:before {
+  content: "\e6de";
+}
+
+.icon-AIzhuanqu:before {
+  content: "\e6df";
+}
+
+.icon-zidingyi:before {
+  content: "\e6e0";
+}
+
+.icon-zhinengduihua:before {
+  content: "\e6e1";
+}
+

src/assets/font/iconfont.json

@@ -0,0 +1,163 @@
+{
+  "id": "",
+  "name": "",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "1090",
+      "name": "图书",
+      "font_class": "tushu",
+      "unicode": "f00a1",
+      "unicode_decimal": 983201
+    },
+    {
+      "icon_id": "7831447",
+      "name": "列表",
+      "font_class": "liebiao",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "46348424",
+      "name": "笔记",
+      "font_class": "biji",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "46348425",
+      "name": "发现",
+      "font_class": "faxian",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "46348426",
+      "name": "会员",
+      "font_class": "huiyuan",
+      "unicode": "e6d0",
+      "unicode_decimal": 59088
+    },
+    {
+      "icon_id": "46348427",
+      "name": "共享群",
+      "font_class": "gongxiangqun",
+      "unicode": "e6d1",
+      "unicode_decimal": 59089
+    },
+    {
+      "icon_id": "46348428",
+      "name": "视频",
+      "font_class": "shipin",
+      "unicode": "e6d2",
+      "unicode_decimal": 59090
+    },
+    {
+      "icon_id": "46348429",
+      "name": "识字",
+      "font_class": "shizi",
+      "unicode": "e6d3",
+      "unicode_decimal": 59091
+    },
+    {
+      "icon_id": "46348430",
+      "name": "签到",
+      "font_class": "qiandao",
+      "unicode": "e6d4",
+      "unicode_decimal": 59092
+    },
+    {
+      "icon_id": "46348431",
+      "name": "备份",
+      "font_class": "beifen",
+      "unicode": "e6d5",
+      "unicode_decimal": 59093
+    },
+    {
+      "icon_id": "46348432",
+      "name": "服务",
+      "font_class": "fuwu",
+      "unicode": "e6d6",
+      "unicode_decimal": 59094
+    },
+    {
+      "icon_id": "46348433",
+      "name": "圈子",
+      "font_class": "quanzi",
+      "unicode": "e6d7",
+      "unicode_decimal": 59095
+    },
+    {
+      "icon_id": "46348434",
+      "name": "文档",
+      "font_class": "wendang",
+      "unicode": "e6d8",
+      "unicode_decimal": 59096
+    },
+    {
+      "icon_id": "46348435",
+      "name": "修复",
+      "font_class": "xiufu",
+      "unicode": "e6d9",
+      "unicode_decimal": 59097
+    },
+    {
+      "icon_id": "46348436",
+      "name": "云手机",
+      "font_class": "yunshouji",
+      "unicode": "e6da",
+      "unicode_decimal": 59098
+    },
+    {
+      "icon_id": "46348437",
+      "name": "动态",
+      "font_class": "dongtai",
+      "unicode": "e6db",
+      "unicode_decimal": 59099
+    },
+    {
+      "icon_id": "46348438",
+      "name": "测心理",
+      "font_class": "cexinli",
+      "unicode": "e6dc",
+      "unicode_decimal": 59100
+    },
+    {
+      "icon_id": "46348439",
+      "name": "相册",
+      "font_class": "xiangce",
+      "unicode": "e6dd",
+      "unicode_decimal": 59101
+    },
+    {
+      "icon_id": "46348440",
+      "name": "美图",
+      "font_class": "meitu",
+      "unicode": "e6de",
+      "unicode_decimal": 59102
+    },
+    {
+      "icon_id": "46348441",
+      "name": "AI专区",
+      "font_class": "AIzhuanqu",
+      "unicode": "e6df",
+      "unicode_decimal": 59103
+    },
+    {
+      "icon_id": "46348442",
+      "name": "自定义",
+      "font_class": "zidingyi",
+      "unicode": "e6e0",
+      "unicode_decimal": 59104
+    },
+    {
+      "icon_id": "46348443",
+      "name": "智能对话",
+      "font_class": "zhinengduihua",
+      "unicode": "e6e1",
+      "unicode_decimal": 59105
+    }
+  ]
+}

src/components/fg-tree/fg-tree.vue

@@ -14,18 +14,20 @@
 </template>
 
 <script setup lang="ts">
+// @ts-ignore
 import { defineProps, defineEmits } from 'vue'
 import FgTreeNode from './fg-tree-node.vue'
 
 const props = defineProps({
   data: {
     type: Array,
-    default: () => []
-  },
+    default: () => [],
+  } as any,
+  
   defaultExpandedKeys: {
     type: Array,
-    default: () => []
-  }
+    default: () => [],
+  },
 })
 
 const emit = defineEmits(['node-click', 'node-expand', 'node-collapse'])
@@ -40,4 +42,4 @@ const emit = defineEmits(['node-click', 'node-expand', 'node-collapse'])
 //   padding: 20rpx;
 //   overflow: auto;
 // }
-</style>
+</style>

src/main.ts

@@ -3,6 +3,8 @@ import App from './App.vue'
 import { requestInterceptor } from './http/interceptor'
 import i18n from './locale/index'
 import { routeInterceptor } from './router/interceptor'
+import '@/assets/font/iconfont.css';
+import '@/assets/font/iconfont.js';
 
 import store from './store'
 import '@/style/index.scss'

src/pages/knowledge/index.vue

@@ -1,56 +1,41 @@
 <script setup lang="ts">
-import { ref } from 'vue'
-import searchimg from '@/assets/searchimgs.png'
-const list = ref([
-  {
-    backcolor: '#215ACD',
-  },
-  {
-    backcolor: '#38B865',
-  },
-  {
-    backcolor: '#EB5E12',
-  },
-  {
-    backcolor: '#215ACD',
-  },
-  {
-    backcolor: '#215ACD',
-  },
-  {
-    backcolor: '#38B865',
-  },
-  {
-    backcolor: '#215ACD',
-  },
-  {
-    backcolor: '#38B865',
-  },
-  {
-    backcolor: '#EB5E12',
-  },
-  {
-    backcolor: '#8848D7',
-  },
-  {
-    backcolor: '#EB5E12',
-  },
-  {
-    backcolor: '#8848D7',
-  },
-  {
-    backcolor: '#38B865',
-  },
-  {
-    backcolor: '#EB5E12',
-  },
-  {
-    backcolor: '#8848D7',
-  },
-  {
-    backcolor: '#8848D7',
-  },
-])
+import { ref, onMounted } from 'vue'
+import defimage from '@/assets/image.png'
+import { queryrecentviewlistAPI } from '@/api/knowledge/index'
+const list = ref([])
+const isloading = ref(false)
+const pageNum = ref(1)
+const pageSize = ref(10)
+const total = ref(0)
+const queryrecentviewlistAPIfn = async (loadMore = false) => {
+  try {
+    isloading.value = true
+    const res = (await queryrecentviewlistAPI({
+      pageNum: pageNum.value,
+      pageSize: pageSize.value,
+    })) as any
+    if (res.code === 200) {
+      if (loadMore) {
+        list.value = [...list.value, ...(res?.rows || [])]
+      } else {
+        list.value = res?.rows
+      }
+      total.value = res?.total
+    }
+    console.log(res)
+  } catch (err) {
+    uni.showToast({
+      title: '加载失败',
+      icon: 'none',
+    })
+  } finally {
+    isloading.value = false
+  }
+}
+
+onLoad(() => {
+  queryrecentviewlistAPIfn()
+})
 const handleKnowledgeSearch = () => {
   uni.navigateTo({
     url: '/pages/knowledge/search/index',
@@ -61,9 +46,24 @@ const handleMyExamination = () => {
     url: '/pages/knowledge/exam/index',
   })
 }
+
+const handleLoadMore = async () => {
+  if (list.value.length >= total.value) {
+    uni.showToast({
+      title: '没有更多数据了',
+      icon: 'none',
+    })
+    return
+  }
+  pageNum.value++
+  await queryrecentviewlistAPIfn(true)
+}
 </script>
 <template>
   <view class="knowledge">
+    <view v-if="isloading" class="loading-container">
+      <wd-loading size="40px" color="#215ACD"></wd-loading>
+    </view>
     <view class="header_nav">知识学院</view>
     <view class="header_nav_item">
       <view class="header_nav_item_items" @tap="handleKnowledgeSearch">
@@ -75,25 +75,50 @@ const handleMyExamination = () => {
         <view class="header_nav_item_items_icon right_items"></view>
       </view>
     </view>
-    <view class="main_list">
+    <scroll-view
+      class="main_list"
+      :scroll-y="true"
+      @scrolltolower="handleLoadMore"
+    >
       <view class="main_list_title">最近查看</view>
       <view class="main_list_items" v-for="(item, index) in list" :key="index">
-        <view
-          class="main_list_items_icon"
-          :style="{ background: item.backcolor }"
-        >
-          <view
-            class="main_list_items_icon_line"
-            v-for="(line, lineIndex) in 3"
-            :key="lineIndex"
-          ></view>
+        <view class="main_list_items_icon">
+          <text
+            v-if="item?.icon?.includes('iconfont')"
+            :class="[item.icon.split(',')[0]]"
+            :style="{ color: item.icon.split(',')[1], 'font-size': '48rpx' }"
+          ></text>
+          <image
+            v-else-if="item?.attachmentUrl.length > 0"
+            style="width: 100%; height: 100%; border-radius: 20rpx"
+            :src="item?.attachmentUrl[0]"
+            alt=""
+          />
+          <!-- iconfont icon-tushu,#1890ff,blue-book -->
+          <text
+            v-else
+            class="iconfont icon-tushu"
+            style="font-size: 48rpx; color: #1890ff"
+          ></text>
         </view>
         <view class="main_list_items_text">
-          <span>我的文件</span>
-          <span>文档介绍</span>
+          <span>{{ item.title }}</span>
+          <span>暂无介绍</span>
         </view>
       </view>
-    </view>
+      <view v-if="isloading && list.length > 0" class="load-more">
+        <wd-loading size="20px" color="#215ACD"></wd-loading>
+        <text style="margin-left: 10rpx; font-size: 24rpx; color: #86909c"
+          >加载中...</text
+        >
+      </view>
+      <view
+        v-if="!isloading && list.length > 0 && list.length >= total"
+        class="load-more"
+      >
+        <text style="font-size: 24rpx; color: #86909c">- 暂无数据 -</text>
+      </view>
+    </scroll-view>
   </view>
 </template>
 <style scoped lang="scss">
@@ -161,7 +186,7 @@ body {
     }
   }
   .main_list {
-    flex: 0.9;
+    flex: 1;
     width: 100%;
     // background-color: red;
     min-height: 0;
@@ -169,6 +194,9 @@ body {
     flex-direction: column;
     gap: 42rpx;
     overflow-y: auto;
+    overflow-x: hidden;
+    box-sizing: border-box;
+    padding-bottom: 150rpx;
     .main_list_title {
       font-family: Alibaba PuHuiTi 2;
       font-weight: 500;
@@ -178,10 +206,11 @@ body {
       line-height: 36rpx;
       letter-spacing: 0px;
       color: #31373d;
-      // position: sticky;
-      // top: 0;
-      // z-index: 1;
-      // background-color: #ffffff;
+      margin-bottom: 42rpx;
+      //  position: sticky;
+      //  top: 0;
+      //  z-index: 1;
+      //  background-color: #ffffff;
     }
     .main_list_items {
       width: 100%;
@@ -190,12 +219,15 @@ body {
       box-sizing: border-box;
       display: flex;
       gap: 16rpx;
+      margin-bottom: 42rpx;
 
       // background-color: aqua;
       .main_list_items_text {
         display: flex;
         flex-direction: column;
         justify-content: space-between;
+        flex: 1;
+        overflow: hidden;
         :nth-child(1) {
           font-family: Alibaba PuHuiTi 2;
           font-weight: 500;
@@ -205,6 +237,9 @@ body {
           line-height: 32rpx;
           letter-spacing: 0px;
           color: #31373d;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
         :nth-child(2) {
           font-family: Alibaba PuHuiTi 2;
@@ -215,29 +250,45 @@ body {
           line-height: 28rpx;
           letter-spacing: 0px;
           color: #86909c;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
       }
       .main_list_items_icon {
         width: 74rpx;
         height: 86rpx;
-        border-radius: 20rpx;
-        padding: 20rpx;
-        box-sizing: border-box;
+        // border-radius: 20rpx;
+        // padding: 20rpx;
+        // box-sizing: border-box;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-        .main_list_items_icon_line {
-          width: 100%;
-          height: 6rpx;
-          border-radius: 4rpx;
-          background-color: #ffffff;
-          &:nth-child(1) {
-            width: 60%;
-          }
-        }
+        flex-shrink: 0;
       }
     }
   }
 }
-</style>
+.loading-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.8);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
 
+.load-more {
+  width: 100%;
+  height: 80rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+}
+</style>

src/pages/knowledge/search/details/index.vue

@@ -1,94 +1,48 @@
-<template>
-  <view class="knowledgebase_details">
-    <view class="header_details">
-      <input class="details_input" type="text" placeholder="搜索" />
-    </view>
-    <view class="main_list">
-      <view class="main_list_title">主页</view>
-      <div class="main_tree">
-        <FgTree
-          :data="treeData"
-          :default-expanded-keys="[1, 3]"
-          @node-click="handleNodeClick"
-          @node-expand="handleNodeExpand"
-          @node-collapse="handleNodeCollapse"
-        />
-      </div>
-    </view>
-  </view>
-</template>
-
 <script setup lang="ts">
 import { ref } from 'vue'
 import FgTree from '@/components/fg-tree/fg-tree.vue'
-
+import { queryKnowledgeContentlist } from '@/api/knowledge/index'
 interface TreeNode {
   id: number
   label: string
   children?: TreeNode[]
 }
-
-const treeData = ref<TreeNode[]>([
-  {
-    id: 1,
-    label: '一级节点 1',
-    children: [
-      {
-        id: 11,
-        label: '二级节点 1-1',
-        children: [
-          {
-            id: 111,
-            label: '三级节点 1-1-1',
-          },
-          {
-            id: 112,
-            label: '三级节点 1-1-2',
-          },
-        ],
-      },
-      {
-        id: 12,
-        label: '二级节点 1-2',
-      },
-    ],
-  },
-  {
-    id: 2,
-    label: '一级节点 2',
-    children: [
-      {
-        id: 21,
-        label: '二级节点 2-1',
-      },
-      {
-        id: 22,
-        label: '二级节点 2-2',
-      },
-    ],
-  },
-  {
-    id: 3,
-    label: '一级节点 3',
-    children: [
-      {
-        id: 31,
-        label: '二级节点 3-1',
-        children: [
-          {
-            id: 311,
-            label: '三级节点 3-1-1',
-          },
-        ],
-      },
-    ],
-  },
-])
+const paramsoptions = ref({}) as any
+const treeData = ref<TreeNode[]>([])
+const isloading = ref(false)
+//获取树形列表
+const queryKnowledgeContentlistfn = async () => {
+  try {
+    isloading.value = true
+    const res = (await queryKnowledgeContentlist({
+      categoryId: paramsoptions.value?.id,
+    })) as any
+    if (res.code === 200) {
+      const deepTree = (item: any) => {
+        return {
+          id: item.id,
+          label: item.title,
+          children: item?.children?.map((child: any) => {
+            return deepTree(child)
+          }),
+        }
+      }
+      treeData.value = res?.data?.map((item: any) => deepTree(item))
+    }
+  } catch (error) {
+    console.log(error)
+  } finally {
+    isloading.value = false
+  }
+}
+onLoad(async (options) => {
+  paramsoptions.value = options
+  await queryKnowledgeContentlistfn()
+})
 
 const handleNodeClick = (node: TreeNode) => {
-  console.log('点击节点:', node)
   uni.navigateTo({
-    url: '/pages/knowledge/search/details/viewdetails/index',
+    url: `/pages/knowledge/search/details/viewdetails/index?id=${node?.id}&classId=${paramsoptions.value?.id}`,
   })
 }
 
@@ -100,6 +54,28 @@ const handleNodeCollapse = (node: TreeNode) => {
   console.log('折叠节点:', node)
 }
 </script>
+<template>
+  <view class="knowledgebase_details">
+    <view v-if="isloading" class="loading-container">
+      <wd-loading size="40px" color="#215ACD"></wd-loading>
+    </view>
+    <view class="header_details">
+      <input class="details_input" type="text" placeholder="搜索" />
+    </view>
+    <view class="main_list">
+      <view class="main_list_title">{{ paramsoptions?.name }}</view>
+      <div class="main_tree">
+        <FgTree
+          :data="treeData"
+          :default-expanded-keys="[1, 3]"
+          @node-click="handleNodeClick"
+          @node-expand="handleNodeExpand"
+          @node-collapse="handleNodeCollapse"
+        />
+      </div>
+    </view>
+  </view>
+</template>
 
 <style scoped lang="scss">
 html,
@@ -121,7 +97,7 @@ body {
       width: 100%;
       height: 100%;
       background-color: #f6f6f6;
-      background-image: url('../searchicon.png');
+      background-image: url('../../../../assets/searchicon.png');
       background-repeat: no-repeat;
       background-position: 20rpx center;
       background-size: 30rpx 30rpx;
@@ -156,4 +132,16 @@ body {
     }
   }
 }
+.loading-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.8);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
 </style>

src/pages/knowledge/search/details/viewdetails/index.vue

@@ -1,5 +1,16 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, reactive } from 'vue'
+import {
+  getKnowledgeContentDetail,
+  querycomment,
+  addComment,
+  queryrecord,
+} from '@/api/knowledge/index'
+import { uploadUrl } from '@/utils/uploadFile'
+import { useUserStore } from '@/store/user'
+const userStore = useUserStore()
+const uploadAction = uploadUrl.USER_AVATAR
+const isloading = ref(false)
 const footernav = ref([
   {
     name: '评论',
@@ -7,58 +18,214 @@ const footernav = ref([
   {
     name: '查看记录',
   },
-  {
-    name: '收藏记录',
-  },
 ])
+const replyContents = reactive({})
+const handleReplyInput = (e: any, commentId: string) => {
+  replyContents[commentId] = e.detail.value
+}
 const selected = ref('评论')
-const commentlist = ref([
-  {
-    name: '静静（站长）',
-    time: '3小时前',
-    content:
-      '评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容。',
-    reply: '张三：谢谢站长支持',
-  },
-  {
-    name: '静静（站长）',
-    time: '3小时前',
-    content:
-      '评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容。',
-    reply: '张三：谢谢站长支持',
-  },
-  {
-    name: '静静（站长）',
-    time: '3小时前',
-    content:
-      '评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容。',
-    reply: '张三：谢谢站长支持',
-  },
-])
+const commentlist = ref([]) as any
+const paramsoptions = ref({}) as any
+const maindata = ref({}) as any
+const isReply = ref({}) as any
+const commentipt = ref<string>('')
+const fileListup = ref([])
+const viewRecords = ref([])
+// 控制回复内容展开/收起的状态
+const expandedReplies = ref({}) as any
+//获取知识库内容详细信息
+const queryKnowledgeContentDetailfn = async () => {
+  try {
+    isloading.value = true
+    const res = (await getKnowledgeContentDetail({
+      roleId: paramsoptions.value?.id,
+    })) as any
+    if (res.code === 200) {
+      maindata.value = res?.data || {}
+    }
+  } catch (error) {
+    console.log(error)
+  } finally {
+    isloading.value = false
+  }
+}
+//获取评论列表
+const querycommentfn = async () => {
+  try {
+    isloading.value = true
+    const res = (await querycomment({
+      targetId: '14',
+      targetType: 'knowledge',
+    })) as any
+    if (res.code === 200) {
+      commentlist.value = res?.data || []
+    }
+  } catch (error) {
+    console.log(error)
+  } finally {
+    isloading.value = false
+  }
+}
+//获取查看记录
+const queryrecordfn = async () => {
+  try {
+    isloading.value = true
+    const res = (await queryrecord({
+      contentId: paramsoptions.value?.classId,
+      userId: userStore.userInfo.user.userId,
+    })) as any
+    viewRecords.value = res?.rows || []
+  } catch (error) {
+    console.log(error)
+  } finally {
+    isloading.value = false
+  }
+}
+onLoad(async (options) => {
+  paramsoptions.value = options
+  await Promise.all([
+    queryKnowledgeContentDetailfn(),
+    querycommentfn(),
+    queryrecordfn(),
+  ])
+})
 const navigateToReminder = () => {
   uni.navigateTo({
     url: '/pages/knowledge/search/details/viewdetails/reminder',
   })
 }
+const formatRelativeTime = (dateString: any) => {
+  const date = new Date(dateString)
+  const now = new Date()
+  const diff = now.getTime() - date.getTime()
+  if (diff < 60_000) {
+    return '刚刚'
+  }
+  const minutes = Math.floor(diff / 60_000)
+  const hours = Math.floor(diff / 3_600_000)
+  const days = Math.floor(diff / 86_400_000)
+
+  if (minutes < 60) {
+    return `${minutes}分钟前`
+  } else if (hours < 24) {
+    return `${hours}小时前`
+  } else {
+    return `${days}天前`
+  }
+}
+const download = (url) => {
+  uni.downloadFile({
+    url: url,
+    success: (res) => {
+      if (res.statusCode === 200) {
+        // uni.saveFile({
+        //   tempFilePath: res.tempFilePath,
+        //   success: function (res) {
+        //     console.log(res);
+        //   },
+        // })
+      }
+    },
+  })
+}
+// 提交评论
+const handleSend = async () => {
+  if (!commentipt.value.trim() && fileListup.value.length === 0) {
+    uni.showToast({
+      icon: 'error',
+      title: '请输入评论内容或上传图片',
+    })
+    return
+  }
+  try {
+    await addComment({
+      targetId: Number(paramsoptions.value?.classId),
+      targetType: 'knowledge',
+      attachments: fileListup.value
+        .map((item) => JSON.parse(item.response).data.fileName)
+        .join(','),
+      content: commentipt.value,
+    })
+    commentipt.value = ''
+    fileListup.value = []
+    querycommentfn()
+  } catch {
+    uni.showToast({
+      icon: 'error',
+      title: '评论提交失败',
+    })
+  }
+}
+
+const handleUploadSuccess = ({ file, fileList, formData }) => {
+  fileListup.value = fileList
+}
+const handleUploadRemove = ({ file }) => {
+  fileListup.value = fileListup.value.filter((item) => item.uid !== file.uid)
+}
+const handleReply = (data) => {
+  isReply.value[data.id] = !isReply.value[data.id]
+}
+const handleClose = (id) => {
+  isReply.value[id] = false
+}
+const handleReplySubmit = async (id: any) => {
+  console.log(replyContents)
+  if (!replyContents[id].trim()) {
+    uni.showToast({
+      icon: 'error',
+      title: '评论提交失败',
+    })
+    return
+  }
+  try {
+    await addComment({
+      parentId: id,
+      targetId: Number(paramsoptions.value?.classId),
+      targetType: 'knowledge',
+      content: replyContents[id] || '',
+    })
+    querycommentfn()
+    isReply.value[id] = false
+    replyContents[id] = ''
+  } catch {
+    uni.showToast({
+      icon: 'error',
+      title: '评论提交失败',
+    })
+  }
+}
+const toggleReplyExpand = (commentId: string, replyIndex: any) => {
+  const key = `${commentId}-${replyIndex}`
+  expandedReplies.value[key] = !expandedReplies.value[key]
+}
 </script>
 <template>
   <view class="viewdetails">
+    <view v-if="isloading" class="loading-container">
+      <wd-loading size="40px" color="#215ACD"></wd-loading>
+    </view>
     <view class="viewdetails_header">
-      <view class="viewdetails_header_title"> 主页 </view>
-      <view class="viewdetails_header_time"> 编辑于2025-01-17 18:12:38 </view>
+      <view class="viewdetails_header_title">
+        {{ maindata?.title || '' }}
+      </view>
+      <view class="viewdetails_header_time">
+        {{ `编辑于${maindata?.updateTime || ''}` }}
+      </view>
     </view>
     <view class="viewdetails_main_box">
-      <view class="viewdetails_main" v-for="value in 5">
-        <view class="viewdetails_main_title"> 编辑内容 </view>
-        <view class="viewdetails_main_content">
-          正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文正文
-        </view>
+      <view class="viewdetails_main">
+        <view v-html="maindata?.content || ''"></view>
       </view>
       <view class="viewdetails_upload_box">
-        <view class="viewdetails_upload" v-for="value in 2">
+        <view
+          class="viewdetails_upload"
+          @click="download(value)"
+          v-for="value in maindata?.attachmentUrl"
+        >
           <view class="viewdetails_upload_title">
-            <span>MWwwwwww.png</span>
-            <span>365kb</span>
+            <span>{{ value.split('?')[0].split('/').pop() || '' }}</span>
+            <span>kb</span>
           </view>
           <view class="viewdetails_upload_download">
             <wd-icon
@@ -89,42 +256,190 @@ const navigateToReminder = () => {
         </view>
         <view v-if="selected === '评论'">
           <view class="viewdetails_footer_comment_ipt">
-            <input
-              class="viewdetails_footer_comment_ipt_input"
-              type="text"
-              placeholder="说点什么..."
-            />
-            <view class="viewdetails_footer_comment_ipt_send"> </view>
-          </view>
-          <view
-            class="viewdetails_footer_comment_list"
-            v-for="item in commentlist"
-            :key="item.name"
-          >
-            <view class="viewdetails_footer_comment_list_info">
-              <view class="viewdetails_footer_comment_list_avatvr">{{
-                item.name.slice(0, 2)
-              }}</view>
-              <span class="viewdetails_footer_comment_list_name">{{
-                item.name
-              }}</span>
-            </view>
-            <view class="viewdetails_footer_comment_list_content">
-              {{ item.content }}
-            </view>
-            <view class="viewdetails_footer_comment_list_time">
-              <span class="viewdetails_footer_comment_list_time_text">{{
-                item.time
-              }}</span>
-              <span class="viewdetails_footer_comment_list_time_reply"
-                >回复</span
+            <view class="viewdetails_footer_comment_ipt_input">
+              <input
+                v-model="commentipt"
+                type="text"
+                placeholder="说点什么..."
+                :maxlength="200"
+                @keydown.enter="handleSend"
+              />
+              <view
+                style="
+                  position: absolute;
+                  bottom: 8rpx;
+                  right: 16rpx;
+                  font-size: 20rpx;
+                  color: #999;
+                "
               >
+                <text>{{ commentipt.length }}/200</text>
+              </view>
             </view>
-            <view class="viewdetails_footer_comment_list_reply">
-              {{ item.reply }}
+
+            <wd-upload
+              :file-list="fileListup"
+              :action="uploadAction"
+              image-mode="aspectFill"
+              :limit="1"
+              @success="handleUploadSuccess"
+              @remove="handleUploadRemove"
+            >
+              <template #default>
+                <view class="viewdetails_footer_comment_ipt_send"> </view>
+              </template>
+            </wd-upload>
+          </view>
+          <view style="display: flex; flex-direction: column; gap: 40rpx">
+            <view
+              class="viewdetails_footer_comment_list"
+              v-for="item in commentlist"
+              :key="item.name"
+            >
+              <view class="viewdetails_footer_comment_list_info">
+                <view class="viewdetails_footer_comment_list_avatvr">{{
+                  item?.username?.slice(-2) || ''
+                }}</view>
+                <span class="viewdetails_footer_comment_list_name">{{
+                  item?.username
+                }}</span>
+              </view>
+              <view class="viewdetails_footer_comment_list_content">
+                {{ item.content }}
+              </view>
+              <view>
+                <wd-img
+                  v-for="(value, index) in item?.attachmentsUrl"
+                  :key="index"
+                  :src="value"
+                  :width="50"
+                  :height="50"
+                  :enable-preview="true"
+                />
+              </view>
+              <view class="viewdetails_footer_comment_list_time">
+                <span class="viewdetails_footer_comment_list_time_text">{{
+                  formatRelativeTime(item?.updateTime)
+                }}</span>
+                <span
+                  class="viewdetails_footer_comment_list_time_reply"
+                  @tap="handleReply(item)"
+                  >回复</span
+                >
+              </view>
+              <view
+                class="viewdetails_footer_comment_list_reply"
+                v-for="(value, index) in item?.children"
+                :key="index"
+              >
+                <text>{{ value?.username }}：</text>
+                <template v-if="value?.content?.length > 50">
+                  <text class="reply-content" v-if="!expandedReplies[`${item.id}-${index}`]">
+                    {{ value.content.substring(0, 50) }}...
+                  </text>
+                  <text class="reply-content" v-else>
+                    {{ value.content }}
+                  </text>
+                  <text 
+                    class="reply-expand-btn" 
+                    @tap="toggleReplyExpand(item.id, index)"
+                  >
+                    {{ expandedReplies[`${item.id}-${index}`] ? '收起' : '展开' }}
+                  </text>
+                </template>
+                <template v-else>
+                  <text class="reply-content">{{ value?.content }}</text>
+                </template>
+              </view>
+              <view
+                class="viewdetails_footer_comment_list_reply_box"
+                v-if="isReply[item?.id]"
+              >
+                <view style="position: relative; width: 100%">
+                  <input
+                    class="viewdetails_footer_comment_list_reply_ipt"
+                    type="text"
+                    placeholder="写下您的回复..."
+                    :maxlength="200"
+                    v-model="replyContents[item?.id]"
+                    @input="(e) => handleReplyInput(e, item?.id)"
+                  />
+                  <view
+                    style="
+                      position: absolute;
+                      bottom: 8rpx;
+                      right: 16rpx;
+                      font-size: 20rpx;
+                      color: #999;
+                    "
+                  >
+                    <text
+                      >{{ (replyContents[item?.id] || '').length }}/200</text
+                    >
+                  </view>
+                </view>
+                <view style="display: flex; gap: 20rpx">
+                  <wd-button
+                    size="small"
+                    @tap="handleReplySubmit(item?.id)"
+                    style="
+                      padding: 6rpx 16rpx;
+                      font-size: 24rpx;
+                      border-radius: 14rpx;
+                    "
+                    >提交</wd-button
+                  >
+                  <wd-button
+                    plain
+                    size="small"
+                    style="
+                      padding: 6rpx 16rpx;
+                      font-size: 24rpx;
+                      border-radius: 14rpx;
+                    "
+                    @tap="handleClose(item?.id)"
+                    >收起</wd-button
+                  >
+                </view>
+              </view>
             </view>
           </view>
         </view>
+        <view
+          v-else
+          style="
+            display: flex;
+            flex-direction: column;
+            gap: 40rpx;
+            margin-top: 40rpx;
+          "
+        >
+          <view
+            v-for="item in viewRecords"
+            :key="item.id"
+            style="
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            "
+          >
+            <view
+              style="
+                width: 80rpx;
+                height: 80rpx;
+                border-radius: 50%;
+                background-color: #234b9a;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                color: #fff;
+              "
+              >{{ item?.userName?.slice(-2) || '' }}</view
+            >
+            <view style="color: #31373d">{{ item?.userName }}</view>
+            <view style="color: #999">{{ item?.updateTime }}</view>
+          </view>
+        </view>
       </view>
     </view>
     <view class="viewdetails_footer_btn" @tap="navigateToReminder">提 醒</view>
@@ -177,27 +492,27 @@ body {
 }
 .viewdetails_main {
   width: 100%;
-  .viewdetails_main_title {
-    font-family: Alibaba PuHuiTi 2;
-    font-weight: 400;
-    font-style: 55 Regular;
-    font-size: 42rpx;
-    leading-trim: NONE;
-    line-height: 80rpx;
-    letter-spacing: 4%;
-    margin-bottom: 18rpx;
-    color: #31373d;
-  }
-  .viewdetails_main_content {
-    font-family: Alibaba PuHuiTi 2;
-    font-weight: 400;
-    font-style: 55 Regular;
-    font-size: 28rpx;
-    leading-trim: NONE;
-    line-height: 44rpx;
-    letter-spacing: 4%;
-    color: #31373d;
-  }
+  // .viewdetails_main_title {
+  //   font-family: Alibaba PuHuiTi 2;
+  //   font-weight: 400;
+  //   font-style: 55 Regular;
+  //   font-size: 42rpx;
+  //   leading-trim: NONE;
+  //   line-height: 80rpx;
+  //   letter-spacing: 4%;
+  //   margin-bottom: 18rpx;
+  //   color: #31373d;
+  // }
+  // .viewdetails_main_content {
+  //   font-family: Alibaba PuHuiTi 2;
+  //   font-weight: 400;
+  //   font-style: 55 Regular;
+  //   font-size: 28rpx;
+  //   leading-trim: NONE;
+  //   line-height: 44rpx;
+  //   letter-spacing: 4%;
+  //   color: #31373d;
+  // }
 }
 
 .viewdetails_upload_box {
@@ -283,14 +598,26 @@ body {
     width: 100%;
     height: 80rpx;
     display: flex;
+    align-items: center;
     gap: 32rpx;
     .viewdetails_footer_comment_ipt_input {
+      position: relative;
       height: 100%;
       flex: 1;
       background-color: #f5f5f5;
       border-radius: 8rpx;
       padding: 0 24rpx;
       box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      input {
+        width: 100%;
+        height: 100%;
+        border: none;
+        background: transparent;
+        font-size: 28rpx;
+        color: #31373d;
+      }
     }
     .viewdetails_footer_comment_ipt_send {
       width: 45rpx;
@@ -300,13 +627,17 @@ body {
       background-size: cover;
       align-self: center;
     }
+    :deep(.wd-upload__preview) {
+      width: 110rpx;
+      height: 110rpx;
+    }
   }
   .viewdetails_footer_comment_list {
     width: 100%;
     margin-bottom: 24rpx;
     // display: flex;
     // flex-direction: column;
-    // gap: 24rpx;
+    // gap: 30rpx;
     .viewdetails_footer_comment_list_info {
       display: flex;
       gap: 16rpx;
@@ -356,15 +687,45 @@ body {
     }
     .viewdetails_footer_comment_list_reply {
       width: 100%;
-      height: 80rpx;
-      background-color: #f5f5f5;
+      // background-color: #f5f5f5;
       border-radius: 8rpx;
-      padding: 0 24rpx;
+      padding: 12rpx 24rpx;
       box-sizing: border-box;
       font-size: 24rpx;
       color: #86909c;
-      line-height: 80rpx;
+      line-height: 36rpx;
       margin-top: 16rpx;
+      word-break: break-word;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: flex-start;
+      .reply-content {
+        display: inline;
+        white-space: normal;
+        word-wrap: break-word;
+        flex: 1;
+      }
+      .reply-expand-btn {
+        color: #215acd;
+        font-size: 20rpx;
+        margin-left: 8rpx;
+        cursor: pointer;
+        flex-shrink: 0;
+        align-self: center;
+      }
+    }
+    .viewdetails_footer_comment_list_reply_box {
+      display: flex;
+      flex-direction: column;
+      gap: 16rpx;
+      margin-top: 16rpx;
+      .viewdetails_footer_comment_list_reply_ipt {
+        border: 1px solid #f5f5f5;
+        border-radius: 20rpx;
+        padding: 12rpx;
+        font-size: 24rpx;
+        color: #86909c;
+      }
     }
   }
 }
@@ -378,4 +739,16 @@ body {
   line-height: 80rpx;
   text-align: center;
 }
+.loading-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.8);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
 </style>

src/pages/knowledge/search/details/viewdetails/reminder.vue

@@ -1,3 +1,8 @@
+<script setup lang="ts">
+const handleBack = () => {
+  uni.navigateBack()
+}
+</script>
 <template>
   <view class="viewdetails_reminder">
     <view>
@@ -15,6 +20,19 @@
         class="viewdetails_reminder_textarea"
       ></textarea>
     </view>
+    <view style="display: flex; justify-content: space-between; gap: 40rpx">
+      <wd-button
+        type="info"
+        plain
+        style="flex: 1; border-radius: 12rpx"
+        @click="handleBack"
+        >返回上一步</wd-button
+      >
+      <wd-button
+        style="flex: 1; border-radius: 12rpx; background-color: #215acd"
+        >发送</wd-button
+      >
+    </view>
   </view>
 </template>
 <style scoped lang="scss">

src/pages/knowledge/search/index.vue

@@ -3,13 +3,22 @@ import { ref } from 'vue'
 import { queryKnowledgeCategory } from '@/api/knowledge/index'
 const isloading = ref(false)
 const categories = ref([])
+const pagenum = ref(1)
+const pagesize = ref(15)
 const total = ref(0)
-const createCategory = async () => {
+const createCategory = async (loadMore = false) => {
   try {
     isloading.value = true
-    const res = (await queryKnowledgeCategory({})) as any
+    const res = (await queryKnowledgeCategory({
+      pageNum: pagenum.value,
+      pageSize: pagesize.value,
+    })) as any
     if (res.code === 200) {
-      categories.value = res.rows || []
+      if (loadMore) {
+        categories.value = [...categories.value, ...(res.rows || [])]
+      } else {
+        categories.value = res.rows || []
+      }
       total.value = res.total || 0
     }
   } catch (error) {
@@ -21,45 +30,88 @@ const createCategory = async () => {
 onLoad(() => {
   createCategory()
 })
-const itemClick = (index: number) => {
-  uni.navigateTo({
-    url: '/pages/knowledge/search/details/index',
-  })
+
+// 跳转到详情页
+const navigateToDetail = (id: number) => {
+  const category = categories.value.find((item: any) => item.id === id)
+  const cleaned = category?.icon?.replace(/#/g, '')
+  if (cleaned.includes('iconfont')) {
+    uni.navigateTo({
+      url: `/pages/knowledge/search/details/index?id=${category.id}&name=${category.name}&icon=${cleaned}`,
+    })
+  } else {
+    const iconUrl = category?.iconUrl?.[0] || ''
+    uni.navigateTo({
+      url: `/pages/knowledge/search/details/index?id=${category.id}&name=${category.name}&icon=${encodeURIComponent(iconUrl)}`,
+    })
+  }
+}
+
+const itemClick = (id: number) => {
+  navigateToDetail(id)
+}
+
+// 下拉加载
+const handleLoadMore = async () => {
+  if (categories.value.length >= total.value) {
+    uni.showToast({
+      title: '没有更多数据了',
+      icon: 'none',
+    })
+    return
+  }
+  pagenum.value++
+  await createCategory(true)
 }
 </script>
 <template>
-  <wd-loading type="outline" v-if="isloading" />
-
   <view class="knowledgebase_search">
+    <view v-if="isloading" class="loading-container">
+      <wd-loading size="40px" color="#215ACD"></wd-loading>
+    </view>
     <view class="header_search">
       <input class="search_input" type="text" placeholder="搜索" />
     </view>
-    <view class="main_list">
+    <scroll-view
+      class="main_list"
+      :scroll-y="true"
+      @scrolltolower="handleLoadMore"
+    >
       <view
         class="main_list_items"
         v-for="(item, index) in categories"
-        @tap="itemClick(index)"
+        @tap="itemClick(item.id)"
       >
         <view
           class="main_list_items_icon"
           :style="{ background: item.backcolor }"
         >
-          <view
-            class="main_list_items_icon_line"
-            v-for="(line, lineIndex) in 3"
-            :key="lineIndex"
-          ></view>
+          <text
+            v-if="item.icon.includes('iconfont')"
+            :class="[item.icon.split(',')[0]]"
+            :style="{ color: item.icon.split(',')[1], 'font-size': '48rpx' }"
+          ></text>
+          <image
+            v-else
+            style="width: 100%; height: 100%;border-radius: 20rpx"
+            :src="item.iconUrl[0]"
+            alt=""
+          />
         </view>
         <view class="main_list_items_text">
           <span>{{ item.name }}</span>
           <span>{{ item.description }}</span>
         </view>
       </view>
-    </view>
+      <view
+        v-if="!isloading && categories.length > 0 && categories.length >= total"
+        class="load-more"
+      >
+        <text style="font-size: 24rpx; color: #86909c">- 暂无数据 -</text>
+      </view>
+    </scroll-view>
   </view>
 </template>
-
-<script setup lang="ts"></script>
 <style scoped lang="scss">
 html,
 body {
@@ -98,6 +150,9 @@ body {
     flex-direction: column;
     gap: 42rpx;
     overflow-y: auto;
+    overflow-x: hidden;
+    box-sizing: border-box;
+    padding-bottom: 80rpx;
     .main_list_items {
       width: 100%;
       height: 96rpx;
@@ -105,12 +160,14 @@ body {
       box-sizing: border-box;
       display: flex;
       gap: 16rpx;
+      margin-bottom: 42rpx;
 
       // background-color: aqua;
       .main_list_items_text {
         display: flex;
         flex-direction: column;
         justify-content: space-between;
+        flex: 1;
         :nth-child(1) {
           font-family: Alibaba PuHuiTi 2;
           font-weight: 500;
@@ -120,8 +177,12 @@ body {
           line-height: 32rpx;
           letter-spacing: 0px;
           color: #31373d;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
         :nth-child(2) {
+          width: 50%;
           font-family: Alibaba PuHuiTi 2;
           font-weight: 400;
           font-style: 55 Regular;
@@ -130,28 +191,60 @@ body {
           line-height: 28rpx;
           letter-spacing: 0px;
           color: #86909c;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
       }
       .main_list_items_icon {
         width: 74rpx;
         height: 86rpx;
-        border-radius: 20rpx;
-        padding: 20rpx;
-        box-sizing: border-box;
         display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        .main_list_items_icon_line {
-          width: 100%;
-          height: 6rpx;
-          border-radius: 4rpx;
-          background-color: #ffffff;
-          &:nth-child(1) {
-            width: 60%;
-          }
-        }
+        justify-content: center;
+        align-items: center;
+        flex-shrink: 0;
+        // .iconstyle{
+        //   font-size: 48rpx;
+        // }
+        // border-radius: 20rpx;
+        // padding: 20rpx;
+        // box-sizing: border-box;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: space-between;
+        // .main_list_items_icon_line {
+        //   width: 100%;
+        //   height: 6rpx;
+        //   border-radius: 4rpx;
+        //   background-color: #ffffff;
+        //   &:nth-child(1) {
+        //     width: 60%;
+        //   }
+        // }
       }
     }
   }
 }
+.loading-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.8);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+.load-more {
+  width: 100%;
+  height: 80rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+}
 </style>

src/pages/schedule/view/components/addgasstation/index.vue

@@ -6,6 +6,8 @@ import {
   getPostList,
   queryExecutorList,
   querybaseApilist,
+  queryrCCList,
+  selectAllSysStation,
 } from '@/api/workorder/index'
 import { getDictOptions } from '@/utils/dict'
 import { uploadUrl } from '@/utils/uploadFile'
@@ -27,10 +29,14 @@ const getoptions = ref('')
 const UploadList = ref([])
 const form = ref()
 const getPostListOptions = ref([]) as any //执行岗位
+const getStationIdListOptions = ref([]) as any //场站名称
 const getUserListOptions = ref([]) as any //执行人名称
+const getCCrListOptions = ref([]) as any //抄送人名称
 const getTemplateListOptions = ref([]) as any //任务模板列表
 const postListLoading = ref(false) //执行岗位加载状态
+const stationIdListLoading = ref(false) //场站名称加载状态
 const userListLoading = ref(false) //执行人名称加载状态
+const ccListLoading = ref(false) //抄送人名称加载状态
 const getTaskTypeOptions = () => getDictOptions(DICT_KEYS.TASK_TYPE) //任务类型
 
 onLoad((options) => {
@@ -45,8 +51,9 @@ onLoad((options) => {
 const model = ref({
   type: '',
   executePosition: '',
+  stationId: [],
   executorIds: [],
-  executors: [],
+  // executors: [],
   formType: 'photo',
   templateId: '',
   taskName: '',
@@ -54,10 +61,11 @@ const model = ref({
   endTime: '',
   taskType: '',
   ccReceivers: [],
-  ccReceiversName: [],
+  // ccReceiversName: [],
   description: '',
   attachments: '',
-})
+}) as any
+
 const getPostListfn = async () => {
   if (getPostListOptions.value.length > 0) {
     return
@@ -78,18 +86,50 @@ const getPostListfn = async () => {
               }))
             : []
     } else {
-      showSuccess({
-        msg: '获取岗位列表失败',
+      uni.showToast({
+        icon: 'error',
+        title: '获取岗位列表失败',
       })
     }
   } catch (error) {
-    showSuccess({
-      msg: '获取岗位列表失败',
+    uni.showToast({
+      icon: 'error',
+      title: '获取岗位列表失败',
     })
   } finally {
     postListLoading.value = false
   }
 }
+
+// 场站名称
+const getstationIdListfn = async () => {
+  if (getStationIdListOptions.value.length > 0) {
+    return
+  }
+  stationIdListLoading.value = true
+  try {
+    const { code, data } = (await selectAllSysStation()) as any
+    if (code === 200) {
+      getStationIdListOptions.value = data.map((item: any) => ({
+        label: item.stationName,
+        value: item.id,
+      }))
+    } else {
+      uni.showToast({
+        icon: 'error',
+        title: '获取场站名称列表失败',
+      })
+    }
+  } catch (error) {
+    uni.showToast({
+      icon: 'error',
+      title: '获取场站名称列表失败',
+    })
+  } finally {
+    stationIdListLoading.value = false
+  }
+}
+//执行人
 const getUserListfn = async () => {
   if (getUserListOptions.value.length > 0) {
     return
@@ -101,30 +141,65 @@ const getUserListfn = async () => {
       getUserListOptions.value = data.map((item: any) => ({
         label: `${item.userName}-${item.postName}-${item.stationName}`,
         value: JSON.stringify(item),
+        postId: item.postId,
       }))
     } else {
-      showSuccess({
-        msg: '获取执行人列表失败',
+      uni.showToast({
+        icon: 'error',
+        title: '获取执行人列表失败',
       })
     }
   } catch (error) {
-    showSuccess({
-      msg: '获取执行人列表失败',
+    uni.showToast({
+      icon: 'error',
+      title: '获取执行人列表失败',
     })
   } finally {
     userListLoading.value = false
   }
 }
+//抄送人
+const getCCListfn = async () => {
+  if (getCCrListOptions.value.length > 0) {
+    return
+  }
+  ccListLoading.value = true
+  try {
+    const { code, rows } = (await queryrCCList()) as any
+    if (code === 200) {
+      getCCrListOptions.value = rows.map((item: any) => ({
+        label: item.userName,
+        value: item.userId,
+      }))
+    } else {
+      uni.showToast({
+        icon: 'error',
+        title: '获取抄送人列表失败',
+      })
+    }
+  } catch (error) {
+    uni.showToast({
+      icon: 'error',
+      title: '获取抄送人列表失败',
+    })
+  } finally {
+    ccListLoading.value = false
+  }
+}
 const querybaseApilistfn = async () => {
   if (getTemplateListOptions.value.length > 0) {
     return
   }
   try {
-    const { code, rows } = (await querybaseApilist({ status: 0 })) as any
+    const { code, rows } = (await querybaseApilist({
+      status: 0,
+      pageNum: 1,
+      pageSize: 1000,
+    })) as any
     if (code === 200) {
       getTemplateListOptions.value = rows.map((item: any) => ({
         ...item,
-        label: item.subFormTypeName,
+        label: item.taskName,
         value: item.id,
       }))
     } else {
@@ -167,27 +242,30 @@ function handleSubmit() {
             .map((item) => JSON.parse(item.response).data.fileName)
             .filter(Boolean)
             .join(','),
-          executorIds: model.value.executorIds.map((item) => JSON.parse(item)),
-          executors: model.value.executorIds.map((item) =>
-            String(JSON.parse(item).userId)
-          ),
-          ccReceivers: model.value.ccReceivers
-            .map((item) => JSON.parse(item).userId)
-            .join(','),
-          ccReceiversName: model.value.ccReceivers.map((item) =>
-            String(JSON.parse(item).userId)
-          ),
+            executorIds: model.value.executorIds.map((item) =>JSON.parse(item)),
+          // executors: model.value.executorIds.map((item) =>
+          //   String(JSON.parse(item).userId)
+          // ),
+          ccReceivers: model.value.ccReceivers.join(','),
+
+          // ccReceiversName: model.value.ccReceivers.map((item) =>
+          //   String(JSON.parse(item).userId)
+          // ),
         }
-        if (
-          model.value.formType === 'photo' ||
-          model.value.formType === 'inspection'
-        ) {
+        if (model.value.formType === 'photo' || model.value.formType === 'inspection') {
           delete submitData.templateId
         } else if (model.value.formType === '3') {
-          submitData.taskName =
-            getTemplateListOptions.value.find(
-              (item) => item.id === Number(model.value.templateId)
-            )?.subFormTypeName || ''
+          // delete submitData.taskName
+          // submitData.formType = ''
+          submitData.taskName = getTemplateListOptions.value.find((item) => item.id === Number(model.value.templateId))?.taskName || ''
+        }
+        if(getoptions.value==='新增油站'){
+          //  submitData['executorIds']=model.value.executorIds.map((item) => JSON.parse(item))
+           delete submitData.stationId
+        }else if(getoptions.value==='新增访客'){
+          //  submitData['executorId']=model.value.executorIds.map((item) => JSON.parse(item))
+          //  delete submitData.executorIds
+           submitData.stationId=model.value.stationId.join(',')
         }
         const res = (await addtodoaskslist(submitData)) as any
         if (res?.code === 200) {
@@ -258,6 +336,29 @@ const handleUploadRemove = ({ file }) => {
               :loading="postListLoading"
             />
           </view>
+
+          <view v-if="getoptions === '新增访客'">
+            <view style="display: flex; align-items: center; gap: 4rpx">
+              <text style="color: #fa4350; font-size: 28rpx; font-weight: bold"
+                >*</text
+              >
+              <text style="color: #31373d">场站名称</text>
+            </view>
+            <wd-select-picker
+              style="border-bottom: 1rpx solid #e5e5e5"
+              type="checkbox"
+              label-width="100px"
+              prop="stationId"
+              v-model="model.stationId"
+              placeholder="请选择场站名称"
+              :rules="[{ required: true, message: '请选择场站名称' }]"
+              custom-class="custom-vertical-input"
+              @open="getstationIdListfn"
+              :columns="getStationIdListOptions"
+              :loading="stationIdListLoading"
+            />
+          </view>
+
           <view>
             <view style="display: flex; align-items: center; gap: 4rpx">
               <text style="color: #fa4350; font-size: 28rpx; font-weight: bold"
@@ -275,7 +376,11 @@ const handleUploadRemove = ({ file }) => {
               :rules="[{ required: true, message: '请选择执行人名称' }]"
               custom-class="custom-vertical-input"
               @open="getUserListfn"
-              :columns="getUserListOptions"
+              :columns="
+                getoptions === '新增油站'
+                  ? getUserListOptions.filter((item: any) => item.postId === 3)
+                  : getUserListOptions
+              "
               :loading="userListLoading"
             />
           </view>
@@ -414,9 +519,9 @@ const handleUploadRemove = ({ file }) => {
               placeholder="请选择抄送人"
               :rules="[{ required: true, message: '请选择抄送人' }]"
               custom-class="custom-vertical-input"
-              @open="getUserListfn"
-              :columns="getUserListOptions"
-              :loading="userListLoading"
+              @open="getCCListfn"
+              :columns="getCCrListOptions"
+              :loading="ccListLoading"
             />
           </view>
 

src/pages/schedule/view/index.vue

@@ -21,6 +21,7 @@ interface CalendarDate {
   isOtherMonth: boolean
   isToday: boolean
   isSelected: boolean
+  isPast: boolean
 }
 const mainloing = ref(false)
 const GasStationId = ref('')
@@ -146,6 +147,10 @@ watch(
 watch(
   () => radioActive.value,
   async () => {
+    // 切换视图时默认选中当前时间
+    const today = new Date()
+    selectedDate.value = today
+    currentMonth.value = today
     await queryViewlist()
   }
 )
@@ -179,6 +184,13 @@ const generateDates = () => {
     const isToday = date.toDateString() === today.toDateString()
     let isSelected = date.toDateString() === selectedDate.value.toDateString()
     
+    // 计算是否是过去的日期
+    const dateOnly = new Date(date)
+    dateOnly.setHours(0, 0, 0, 0)
+    const todayOnly = new Date(today)
+    todayOnly.setHours(0, 0, 0, 0)
+    const isPast = dateOnly < todayOnly
+    
     // 周模式下，标记选中日期所在周的所有日期
     if (radioActive.value === '周') {
       const selected = new Date(selectedDate.value)
@@ -202,6 +214,7 @@ const generateDates = () => {
       isOtherMonth: date.getMonth() !== month,
       isToday: isToday,
       isSelected: isSelected,
+      isPast: isPast,
     })
   }
 
@@ -275,7 +288,7 @@ const handleDateClick = async (date: CalendarDate) => {
 }
 const addtodoaskslistfn = (val) => {
   uni.navigateTo({
-    url: `/pages/schedule/view/components/addgasstation/index?type=新增${val}`,
+    url: `/pages/schedule/view/addgasstation/index?type=新增${val}`,
   })
 }
 const handletabs = async (val) => {
@@ -341,9 +354,10 @@ const handletabs = async (val) => {
               'Calendar-date-active': date.isToday,
               'Calendar-date-other': date.isOtherMonth,
               'Calendar-date-selected': date.isSelected && !date.isToday,
+              'Calendar-date-disabled': radioActive === '日' && date.isPast,
             },
           ]"
-          @click="handleDateClick(date)"
+          @click="(radioActive === '日' && date.isPast) ? null : handleDateClick(date)"
         >
           {{ date.day }}
         </view>
@@ -529,6 +543,12 @@ body {
           color: #215ACD;
           background-color: #E6E8EB;
         }
+
+        &.Calendar-date-disabled {
+          color: #c0c4cc;
+          pointer-events: none;
+          cursor: not-allowed;
+        }
       }
     }