diff --git a/src/api/index.js b/src/api/index.js
index 0b11630..170e883 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -19,8 +19,8 @@ const service = axios.create({
 	// baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换
 	// baseURL: 'http://www.tougao.com/', //测试本地 记得切换
 	// baseURL: 'http://192.168.110.110/tougao/public/index.php/',
-	// baseURL: '/api', //本地
-	baseURL: '/', //正式
+	baseURL: '/api', //本地
+	// baseURL: '/', //正式
 
 });
 
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 876e1d5..e034263 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -1199,11 +1199,20 @@ a {
 
 }
 
+/* 给表格中最后一行表头添加红色下边框 */
+/* 给最后一个 table-header-row 添加红色下边框 */
+
+
+
 .wordTableHtml table tr:last-of-type td {
 	border-bottom: 1px solid #000 !important;
 
 }
 
+/* 给最后一个 table-header-row（第二行）加样式 */
+.wordTableHtml table tr.table-header-row:nth-of-type(2) td {
+    border-bottom: 1px solid #000 !important;
+}
 
 .word-container b span {
 	font-weight: bold !important;
@@ -1283,7 +1292,7 @@ a {
 	border-left: 1px dashed #dcdfe6 !important;
 	border-right: 1px dashed #dcdfe6 !important;
 	word-break: keep-all !important;
-	text-align: justify !important;
+	/* text-align: justify !important; */
 }
 
 .word-container table tr td p {
@@ -1317,10 +1326,10 @@ a {
 }
 
 .word-container table tr:first-child td {
-	border-top: 1pt solid #000 !important;
+	/* border-top: 1pt solid #000 !important;
 	mso-border-top-alt: 0.5pt solid #000 !important;
 	border-bottom: 1pt solid #000 !important;
-	mso-border-bottom-alt: 0.5pt solid #000 !important;
+	mso-border-bottom-alt: 0.5pt solid #000 !important; */
 }
 
 .word-container table tr:last-of-type {
@@ -1397,7 +1406,8 @@ a {
 	/* font-size:16px!important; */
 	/* 设置字体颜色 */
 }
-.tinymce-custom-button-addrow  {
+
+.tinymce-custom-button-addrow {
 	font-weight: bold !important;
 	background-color: #cbccd1 !important;
 	/* color: #fff !important; */
diff --git a/src/components/page/Dashboard_.vue b/src/components/page/Dashboard_.vue
index d5c15bf..ccd3e38 100644
--- a/src/components/page/Dashboard_.vue
+++ b/src/components/page/Dashboard_.vue
@@ -1676,10 +1676,12 @@ export default {
                         this.getScoreData();
 						loading.close();
                     } else {
+                        loading.close();
                         this.$message.error(res.msg);
                     }
                 })
                 .catch((err) => {
+                    loading.close();
                     this.$message.error(err);
                 });
 
diff --git a/src/components/page/Login.vue b/src/components/page/Login.vue
index 59dd0ac..95b10c6 100644
--- a/src/components/page/Login.vue
+++ b/src/components/page/Login.vue
@@ -215,6 +215,7 @@
 										localStorage.setItem('U_role', 'superadmin');
 										localStorage.setItem('U_name', res.userinfo.account);
 										localStorage.setItem('U_id', res.userinfo.user_id);
+										return false
 										// localStorage.setItem('U_id', res.userinfo.admin_id);
 										this.$router.push('/');
 									} else if (res.data.roles.includes('editor')) {
diff --git a/src/components/page/components/Tinymce/index copy 2.vue b/src/components/page/components/Tinymce/index copy 2.vue
index 3d3a6dc..629a907 100644
--- a/src/components/page/components/Tinymce/index copy 2.vue	
+++ b/src/components/page/components/Tinymce/index copy 2.vue	
@@ -68,9 +68,7 @@ const tableStyle = ` b span{
                             border-top:none;mso-border-top-alt:none !important;
                             border-bottom:none !important;
                             mso-border-bottom-alt:none !important;
-                            border:1px dashed #dcdfe6 !important; 
-                            border-left:1px dashed #dcdfe6 !important; 
-                            border-right:1px dashed #dcdfe6 !important; 
+                           
                             word-break: keep-all !important;
                             text-align: justify !important; // 设置两端对齐
                             
diff --git a/src/components/page/components/Tinymce/index.vue b/src/components/page/components/Tinymce/index.vue
index 9ef796e..e98bf6b 100644
--- a/src/components/page/components/Tinymce/index.vue
+++ b/src/components/page/components/Tinymce/index.vue
@@ -72,7 +72,7 @@ const tableStyle = ` b span{
                             border-left:1px dashed #dcdfe6 !important;
                             border-right:1px dashed #dcdfe6 !important;
                             word-break: keep-all !important;
-                            text-align: justify !important; // 设置两端对齐
+                            // text-align: justify !important; // 设置两端对齐
 
 
                         }
@@ -115,6 +115,9 @@ const tableStyle = ` b span{
                 }blue {
                     color: rgb(0, 130, 170) !important;
                 }
+                .wordTableHtml table tr.table-header-row:nth-of-type(2) td {
+    border-bottom: 1px solid #000 !important;
+}
 
                         `;
 export default {
diff --git a/src/components/page/components/table/editTable.vue b/src/components/page/components/table/editTable.vue
index d1169b3..a7e23af 100644
--- a/src/components/page/components/table/editTable.vue
+++ b/src/components/page/components/table/editTable.vue
@@ -123,7 +123,7 @@ b span{
                             border-left:1px dashed #dcdfe6 !important;
                             border-right:1px dashed #dcdfe6 !important;
                             word-break: keep-all !important;
-                            text-align: justify !important; // 设置两端对齐
+                            // text-align: justify !important; // 设置两端对齐
 
 
                         }
diff --git a/src/components/page/components/table/table.vue b/src/components/page/components/table/table.vue
index 131e492..58252b2 100644
--- a/src/components/page/components/table/table.vue
+++ b/src/components/page/components/table/table.vue
@@ -76,8 +76,8 @@ export default {
                                         text-align: center;
                                         table-layout: auto;"
                                 >`;
-                this.tableData.forEach((row) => {
-                    modalContent += `<tr>`;
+                this.tableData.forEach((row,i) => {
+                    modalContent += `<tr class="${this.isHeaderRow(i,this.tableData)?'table-header-row':''}">`;
                     row.forEach((cell) => {
                         modalContent += `
                                         <td
@@ -100,6 +100,15 @@ export default {
         }
     },
     methods: {
+        isHeaderRow(rowIndex,table) {
+   
+  
+   console.log('table at line 697:', table)
+   var head=table[0]
+   console.log('head at line 699:', head[0].rowspan)
+   
+     return rowIndex < head[0].rowspan; // 假设前两行是表头
+   },
         getTableContent(type) {
             this.$refs.tinymceChild1.getContent(type);
         },
diff --git a/src/components/page/components/table/word.vue b/src/components/page/components/table/word.vue
index 1dc14bd..4bf8a49 100644
--- a/src/components/page/components/table/word.vue
+++ b/src/components/page/components/table/word.vue
@@ -87,8 +87,8 @@
 
                             <!-- 表格部分 -->
                             <table border="1" style="width: auto; border-collapse: collapse; text-align: center">
-                                <tr v-for="(row, i) in JSON.parse(item.table.table_data)" :key="i">
-                                    <td
+                                <tr v-for="(row, i) in JSON.parse(item.table.table_data)" :key="i" :class="{ 'table-header-row': isHeaderRow(i,item.table.table_data) }">
+                                    <td 
                                         v-for="(cell, i1) in row"
                                         :key="i1"
                                         :colspan="`${cell.colspan || 1}`"
@@ -380,7 +380,7 @@ b span{
                         }
                         table td, table th {
                             padding: 5px;
-                            text-align:left !important;
+                            text-align: !important;
                             white-space: pre-wrap; /* 保留换行符并换行 */
                             word-wrap: break-word; /* 长单词自动换行 */
                             word-break: break-word;
@@ -400,11 +400,9 @@ b span{
                             border-top:none;mso-border-top-alt:none !important;
                             border-bottom:none !important;
                             mso-border-bottom-alt:none !important;
-                            border:1px dashed #dcdfe6 !important;
-                            border-left:1px dashed #dcdfe6 !important;
-                            border-right:1px dashed #dcdfe6 !important;
+                           
                             word-break: keep-all !important;
-                            text-align: justify !important; // 设置两端对齐
+                            // text-align: justify !important; // 设置两端对齐
 
 
                         }
@@ -691,6 +689,16 @@ export default {
             if (outerDiv) {
             }
         },
+         // 判断是否是表头行
+    isHeaderRow(rowIndex,table) {
+   
+    var table=JSON.parse(table)
+    console.log('table at line 697:', table)
+    var head=table[0]
+    console.log('head at line 699:', head[0].rowspan)
+    
+      return rowIndex < head[0].rowspan; // 假设前两行是表头
+    },
         handleDragLeave(e) {
             e.preventDefault();
             e.stopPropagation();
diff --git a/src/components/page/components/table/wordHtml.vue b/src/components/page/components/table/wordHtml.vue
index a52776f..f8d9495 100644
--- a/src/components/page/components/table/wordHtml.vue
+++ b/src/components/page/components/table/wordHtml.vue
@@ -202,7 +202,8 @@
                                                 text-align: center;
                                             "
                                         >
-                                            <tr v-for="(row, rowIndex) in table.table" :key="rowIndex">
+                                            <tr v-for="(row, rowIndex) in table.table" :key="rowIndex" >
+                                               
                                                 <td
                                                     v-for="(cell, cellIndex) in row"
                                                     :key="cellIndex"