知识库整改完成

gateway/src/main/resources/template/js/mainPage/mainPage.js

@@ -21,7 +21,6 @@ layui.config({
 			$("#checkOnWorkNum").html(json.bean.checkOnWorkNum);
 			$("#diskCloudFileNum").html(json.bean.diskCloudFileNum);
 			$("#forumNum").html(json.bean.forumNum);
-			$("#knowledgeNum").html(json.bean.knowledgeNum);
 			initNoticeList();
    		}});
 	}
@@ -48,8 +47,10 @@ layui.config({
 	}
 	
 	function initKnowledgeList(){
-		AjaxPostUtil.request({url: reqBasePath + "mainpage004", params: {}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.knowlgBasePath + "queryEightPassKnowlgList", params: {}, type: 'json', method: 'GET', callback: function (json) {
 			$("#knowledgeList").html(getDataUseHandlebars($("#knowledgeContentTemplate").html(), json));
+			// 我发表的审核通过的知识库数
+			$("#knowledgeNum").html(json.total);
 			matchingLanguage();
 			form.render();
    		}});
@@ -69,11 +70,10 @@ layui.config({
 	
 	// 知识库详情
 	$("body").on("click", ".knowledge", function (e) {
-		rowId = $(this).attr("id");
 		_openNewWindows({
-			url: "../../tpl/knowledgePageShow/details.html", 
+			url:  systemCommonUtil.getUrl('FP2023101500004&id=' + $(this).attr("id"), null),
 			title: "知识库详情",
-			pageId: "knowledgePageShowDetailsPage",
+			pageId: "knowledgeDetailsPage",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 			}});

gateway/src/main/resources/template/tpl/mainPage/mainPage.html

@@ -159,8 +159,8 @@
 	<script type="text/x-handlebars-template" id="knowledgeContentTemplate">
 		{{#each rows}}
 			<tr style="height: 38px;">
-				<td><a href="javascript:;" style="color: #01AAED;" class="knowledge" id="{{id}}">{{title}}</a></td>
-				<td>{{typeName}}</td>
+				<td><a href="javascript:;" style="color: #01AAED;" class="knowledge" id="{{id}}">{{name}}</a></td>
+				<td>{{typeMation.dictName}}</td>
 				<td>{{createTime}}</td>
 			</tr>
 		{{/each}}

knowlg/src/main/resources/template/js/knowledgeDepot/knowledgeDepotList.js

-var rowId = "";
-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window',
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'eleTree'], function (exports) {
-	winui.renderColor();
-	var $ = layui.$,
-		form = layui.form,
-		table = layui.table,
-		eleTree = layui.eleTree;
-	
-	table.render({
-	    id: 'messageTable',
-	    elem: '#messageTable',
-	    method: 'post',
-	    url: sysMainMation.knowlgBasePath + 'knowledgecontent016',
-	    cellMinWidth: 100,
-	    where: getTableParams(),
-	    even: true,
-	    page: true,
-		limits: getLimits(),
-		limit: getLimit(),
-	    cols: [[
-	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-			{ field: 'title', title: '标题', width: 350, templet: function (d) {
-				return '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
-			}},
-			{ field: 'lavel', title: '标签', align: 'left', width: 250, templet: function (d) {
-				var lavel = isNull(d.label) ? [] : d.label.split(',');
-				var str = "";
-				$.each(lavel, function(i, item) {
-					str += '<span class="layui-badge layui-bg-blue">' + item + '</span>';
-				});
-				return str;
-			}},
-	        { field: 'typeName', title: '所属分类',  width: 120 },
-			{ field: 'createName', title: '上传人', align: 'left', width: 100 },
-	        { field: 'createTime', title: '最后编辑时间', align: 'center', width: 120 }
-	    ]],
-	    done: function(json) {
-	    	matchingLanguage();
-	    	if(!loadKnowlgType){
-				initKnowlgType();
-	    	}
-	    }
-	});
-	
-	table.on('tool(messageTable)', function (obj) {
-        var data = obj.data;
-        var layEvent = obj.event;
-        if (layEvent === 'details') { //详情
-        	details(data);
-        }
-    });
-	
-	var loadKnowlgType = false;
-	// 初始化类型
-	function initKnowlgType(){
-		loadKnowlgType = true;
-		var el5;
-		el5 = eleTree.render({
-			elem: '.ele5',
-			url: sysMainMation.knowlgBasePath + "knowledgetype008",
-			defaultExpandAll: true,
-			expandOnClickNode: false,
-			highlightCurrent: true
-		});
-		$(".ele5").hide();
-		$("#typeId").on("click",function (e) {
-			e.stopPropagation();
-			$(".ele5").toggle();
-		});
-		eleTree.on("nodeClick(data5)",function(d) {
-			$("#typeId").val(d.data.currentData.name);
-			$("#typeId").attr("typeId", d.data.currentData.id);
-			$(".ele5").hide();
-		})
-		$(document).on("click",function() {
-			$(".ele5").hide();
-		})
-	}
-
-	form.render();
-	form.on('submit(formSearch)', function (data) {
-		if (winui.verifyForm(data.elem)) {
-			refreshTable();
-		}
-		return false;
-	});
-
-	// 详情
-	function details(data) {
-		rowId = data.id;
-		_openNewWindows({
-			url: "../../tpl/knowledgecontent/knowledgecontentdetails.html",
-			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
-			pageId: "knowledgecontentdetails",
-			area: ['90vw', '90vh'],
-			callBack: function (refreshCode) {
-			}});
-	}
-
-	//刷新数据
-    $("body").on("click", "#reloadTable", function() {
-    	loadTable();
-    });
-    
-    function loadTable() {
-    	table.reloadData("messageTable", {where: getTableParams()});
-    }
-    
-    function refreshTable(){
-    	table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-    }
-
-    function getTableParams() {
-    	return {
-			title: $("#title").val(),
-			label: $("#label").val(),
-			typeId: isNull($("#typeId").val()) ? "" : $("#typeId").attr("typeId")
-		};
-	}
-
-    exports('knowledgeDepotList', {});
-});

knowlg/src/main/resources/template/tpl/knowledgeDepot/knowledgeDepotList.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-	<style type="text/css">
-		.layui-badge{
-			margin-right: 5px;
-		}
-	</style>
-</head>
-<body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">标题</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="title" name="title" placeholder="请输入标题" class="layui-input" />
-	                </div>
-					<label class="layui-form-label">标签</label>
-					<div class="layui-input-inline">
-						<input type="text" id="label" name="label" placeholder="请输入标签" class="layui-input" />
-					</div>
-	                <label class="layui-form-label">所属分类</label>
-					<div class="layui-input-inline">
-						<input type="text" id="typeId" name="typeId" placeholder="请选择分类" class="layui-input" readonly="readonly" typeId=""/>
-						<div class="eleTree ele5" lay-filter="data5"></div>
-					</div>
-	                <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-					<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
-    <div class="winui-toolbar">
-        <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-        </div>
-    </div>
-    <div style="margin:auto 10px;">
-        <table id="messageTable" lay-filter="messageTable"></table>
-    </div>
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/knowledgeDepot/'}).use('knowledgeDepotList');
-    </script>
-</body>
-</html>
\ No newline at end of file