diff --git a/ruoyi-ui/public/static/UEditorPlus/ueditor.all.js b/ruoyi-ui/public/static/UEditorPlus/ueditor.all.js index 5c3119c..ad6b3f6 100644 --- a/ruoyi-ui/public/static/UEditorPlus/ueditor.all.js +++ b/ruoyi-ui/public/static/UEditorPlus/ueditor.all.js @@ -25905,6 +25905,12 @@ UE.plugins["audio"] = function () { td.style.borderWidth = "1px"; td.style.borderStyle = "solid"; }); + //增加下面一段 + utils.each(domUtils.getElementsByTagName(table,'th'),function(th){ + th.style.borderWidth = domUtils.getComputedStyle(th, "border-width"); + th.style.borderStyle = 'solid'; + th.style.borderColor = "black"; + }); } }; @@ -26078,9 +26084,11 @@ UE.plugins["table"] = function () { "table.noBorderTable td,table.noBorderTable th,table.noBorderTable caption{border:1px dashed #ddd !important}" + //插入的表格的默认样式 "table{margin-bottom:10px;border-collapse:collapse;display:table;}" + - "td,th{padding: 5px 10px;border: 1px solid #DDD;}" + + // "td,th{padding: 5px 10px;border: 1px solid #DDD;}" + + "td,th{padding: 5px 10px;border: 1px dashed black}" + "caption{border:1px dashed #DDD;border-bottom:0;padding:3px;text-align:center;}" + - "th{border-top:1px solid #BBB;background-color:#F7F7F7;}" + + // "th{border-top:1px solid #BBB;background-color:#F7F7F7;}" + + "th{border-top:1px dashed black;background-color:#F7F7F7;}" + "table tr.firstRow th{border-top-width:2px;}" + ".ue-table-interlace-color-single{ background-color: #fcfcfc; } .ue-table-interlace-color-double{ background-color: #f7faff; }" + "td p{margin:0;padding:0;}", @@ -26385,7 +26393,8 @@ UE.plugins["table"] = function () { } else { utils.each(tables, function (table) { removeStyleSize(table, true); - domUtils.removeAttributes(table, ["style", "border"]); + // domUtils.removeAttributes(table, ["style", "border"]); + domUtils.removeAttributes(table, ["style"]); utils.each(domUtils.getElementsByTagName(table, "td"), function ( td ) { diff --git a/ruoyi-ui/src/views/officialWebsite/Components/page/index.vue b/ruoyi-ui/src/views/officialWebsite/Components/page/index.vue new file mode 100644 index 0000000..1578856 --- /dev/null +++ b/ruoyi-ui/src/views/officialWebsite/Components/page/index.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue index 1f5a768..2d38f13 100644 --- a/ruoyi-ui/src/views/officialWebsite/competition.vue +++ b/ruoyi-ui/src/views/officialWebsite/competition.vue @@ -127,6 +127,9 @@ +
+ +