From b80d0c5dd5ca242427a07f4891e8a0dc354889b3 Mon Sep 17 00:00:00 2001
From: 明梦爽 <2972214568@qq.com>
Date: 星期三, 19 一月 2022 23:46:29 +0800
Subject: [PATCH] 后台查看功能完成

---
 package-lock.json                          |  191 +++++
 src/assets/404.gif                         |    0 
 src/components/page/introduce.vue          |  125 +--
 src/views/homePage/moreMessage.vue         |  212 ++++-
 src/router.js                              |   35 
 src/components/page/telephone.vue          |  106 +-
 src/components/page/News.vue               |   61 +
 src/api/api.js                             |   33 
 src/assets/css/my_style.css                |    7 
 src/components/page/kePuFengCai.vue        |  137 ++-
 src/views/school.vue                       |   32 
 src/components/NotFound.vue                |   22 
 src/views/notice.vue                       |   59 
 src/components/Administrator/Welcome.vue   |   17 
 src/components/Login.vue                   |   48 -
 src/components/Administrator/Main.vue      |  247 +++++++
 public/index.html                          |    2 
 src/components/Home.vue                    |   43 
 src/components/page/xueShuJiaoLiu.vue      |  131 +-
 src/components/Administrator/AdminHome.vue |   65 +
 src/assets/head.png                        |    0 
 src/utils/request.js                       |    2 
 src/components/page/index.vue              |    2 
 /dev/null                                  |   21 
 src/components/Administrator/Edit.vue      |   33 
 src/main.js                                |    6 
 package.json                               |    6 
 src/views/work.vue                         |   50 
 src/components/page/zhengce.vue            |  128 +-
 src/components/page/keXieXiangMu.vue       |  201 +----
 30 files changed, 1,294 insertions(+), 728 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9b7e2d2..9cd9c53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,21 @@
 {
-  "name": "vue_shop",
+  "name": "xin_chuan",
   "version": "0.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
+      "name": "xin_chuan",
       "version": "0.1.0",
       "dependencies": {
+        "@tinymce/tinymce-vue": "^3.0.1",
         "axios": "^0.18.0",
-        "element-ui": "^2.4.5",
+        "D": "^1.0.0",
+        "element-ui": "^2.15.6",
         "node_module": "^0.0.0",
+        "tinymce": "^5.0.16",
         "vue": "^2.5.22",
+        "vue-quill-editor": "^3.0.6",
         "vue-router": "^3.0.1"
       },
       "devDependencies": {
@@ -952,6 +957,14 @@
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@tinymce/tinymce-vue": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/@tinymce/tinymce-vue/download/@tinymce/tinymce-vue-3.0.1.tgz",
+      "integrity": "sha1-xga11rBwSn/B79+W72CAzcI8iPM=",
+      "peerDependencies": {
+        "vue": "^2.4.3"
       }
     },
     "node_modules/@types/q": {
@@ -3944,6 +3957,12 @@
       "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
       "dev": true
     },
+    "node_modules/D": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/D/download/D-1.0.0.tgz",
+      "integrity": "sha1-w0ik4DT3KEe+USBvxTD8CJ6cwqk=",
+      "deprecated": "Package no longer supported. Contact support@npmjs.com for more info."
+    },
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz",
@@ -3998,8 +4017,7 @@
     "node_modules/deep-equal": {
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/deep-equal/download/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
     },
     "node_modules/deep-is": {
       "version": "0.1.3",
@@ -4409,9 +4427,9 @@
       "dev": true
     },
     "node_modules/element-ui": {
-      "version": "2.5.4",
-      "resolved": "http://registry.npm.taobao.org/element-ui/download/element-ui-2.5.4.tgz",
-      "integrity": "sha1-HgUQMgJqFEvBj3kg8L6SeXdUHLg=",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmmirror.com/element-ui/download/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "dependencies": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -4419,6 +4437,9 @@
         "normalize-wheel": "^1.0.1",
         "resize-observer-polyfill": "^1.5.0",
         "throttle-debounce": "^1.0.1"
+      },
+      "peerDependencies": {
+        "vue": "^2.5.17"
       }
     },
     "node_modules/elliptic": {
@@ -5410,8 +5431,7 @@
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "http://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
-      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
-      "dev": true
+      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
     },
     "node_modules/extend-shallow": {
       "version": "3.0.2",
@@ -5547,6 +5567,11 @@
       "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz",
       "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
       "dev": true
+    },
+    "node_modules/fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.nlark.com/fast-diff/download/fast-diff-1.1.2.tgz",
+      "integrity": "sha1-S2LEK44D3j+EhGC2OQeZIGldAVQ="
     },
     "node_modules/fast-glob": {
       "version": "2.2.6",
@@ -9090,7 +9115,6 @@
       "version": "4.1.1",
       "resolved": "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9474,6 +9498,11 @@
       "dependencies": {
         "no-case": "^2.2.0"
       }
+    },
+    "node_modules/parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/parchment/download/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
     },
     "node_modules/parent-module": {
       "version": "1.0.0",
@@ -10579,6 +10608,45 @@
       "resolved": "http://registry.npm.taobao.org/querystringify/download/querystringify-2.1.0.tgz",
       "integrity": "sha1-fe2N+/eHncxg0KZErGdUsoOtF+8=",
       "dev": true
+    },
+    "node_modules/quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmmirror.com/quill/download/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "dependencies": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      }
+    },
+    "node_modules/quill-delta": {
+      "version": "3.6.3",
+      "resolved": "https://registry.nlark.com/quill-delta/download/quill-delta-3.6.3.tgz",
+      "integrity": "sha1-sZ/SuJQSMBxg4f8hPY2GDqwPEDI=",
+      "dependencies": {
+        "deep-equal": "^1.0.1",
+        "extend": "^3.0.2",
+        "fast-diff": "1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/quill/node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.nlark.com/clone/download/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/quill/node_modules/eventemitter3": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/eventemitter3/download/eventemitter3-2.0.3.tgz",
+      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
     },
     "node_modules/randombytes": {
       "version": "2.0.6",
@@ -12371,6 +12439,11 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
+    "node_modules/tinymce": {
+      "version": "5.0.16",
+      "resolved": "https://registry.npmmirror.com/tinymce/download/tinymce-5.0.16.tgz?cache=0&sync_timestamp=1637123728362&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftinymce%2Fdownload%2Ftinymce-5.0.16.tgz",
+      "integrity": "sha1-fNNPEBbYb6KBZSugLKUCZiHddZA="
+    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "http://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
@@ -13026,6 +13099,19 @@
         "loader-utils": "^1.1.0",
         "vue-hot-reload-api": "^2.3.0",
         "vue-style-loader": "^4.1.0"
+      }
+    },
+    "node_modules/vue-quill-editor": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmmirror.com/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz",
+      "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "quill": "^1.3.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
       }
     },
     "node_modules/vue-router": {
@@ -14533,6 +14619,12 @@
           "dev": true
         }
       }
+    },
+    "@tinymce/tinymce-vue": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/@tinymce/tinymce-vue/download/@tinymce/tinymce-vue-3.0.1.tgz",
+      "integrity": "sha1-xga11rBwSn/B79+W72CAzcI8iPM=",
+      "requires": {}
     },
     "@types/q": {
       "version": "1.5.1",
@@ -17173,6 +17265,11 @@
       "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
       "dev": true
     },
+    "D": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/D/download/D-1.0.0.tgz",
+      "integrity": "sha1-w0ik4DT3KEe+USBvxTD8CJ6cwqk="
+    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz",
@@ -17218,8 +17315,7 @@
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/deep-equal/download/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
     },
     "deep-is": {
       "version": "0.1.3",
@@ -17569,9 +17665,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.5.4",
-      "resolved": "http://registry.npm.taobao.org/element-ui/download/element-ui-2.5.4.tgz",
-      "integrity": "sha1-HgUQMgJqFEvBj3kg8L6SeXdUHLg=",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmmirror.com/element-ui/download/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -18405,8 +18501,7 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "http://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
-      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
-      "dev": true
+      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
     },
     "extend-shallow": {
       "version": "3.0.2",
@@ -18516,6 +18611,11 @@
       "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz",
       "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
       "dev": true
+    },
+    "fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.nlark.com/fast-diff/download/fast-diff-1.1.2.tgz",
+      "integrity": "sha1-S2LEK44D3j+EhGC2OQeZIGldAVQ="
     },
     "fast-glob": {
       "version": "2.2.6",
@@ -21370,8 +21470,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -21672,6 +21771,11 @@
       "requires": {
         "no-case": "^2.2.0"
       }
+    },
+    "parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/parchment/download/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
     },
     "parent-module": {
       "version": "1.0.0",
@@ -22581,6 +22685,41 @@
       "resolved": "http://registry.npm.taobao.org/querystringify/download/querystringify-2.1.0.tgz",
       "integrity": "sha1-fe2N+/eHncxg0KZErGdUsoOtF+8=",
       "dev": true
+    },
+    "quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmmirror.com/quill/download/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "requires": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.nlark.com/clone/download/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+        },
+        "eventemitter3": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmmirror.com/eventemitter3/download/eventemitter3-2.0.3.tgz",
+          "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+        }
+      }
+    },
+    "quill-delta": {
+      "version": "3.6.3",
+      "resolved": "https://registry.nlark.com/quill-delta/download/quill-delta-3.6.3.tgz",
+      "integrity": "sha1-sZ/SuJQSMBxg4f8hPY2GDqwPEDI=",
+      "requires": {
+        "deep-equal": "^1.0.1",
+        "extend": "^3.0.2",
+        "fast-diff": "1.1.2"
+      }
     },
     "randombytes": {
       "version": "2.0.6",
@@ -24120,6 +24259,11 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
+    "tinymce": {
+      "version": "5.0.16",
+      "resolved": "https://registry.npmmirror.com/tinymce/download/tinymce-5.0.16.tgz?cache=0&sync_timestamp=1637123728362&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftinymce%2Fdownload%2Ftinymce-5.0.16.tgz",
+      "integrity": "sha1-fNNPEBbYb6KBZSugLKUCZiHddZA="
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "http://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
@@ -24684,6 +24828,15 @@
         "vue-style-loader": "^4.1.0"
       }
     },
+    "vue-quill-editor": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmmirror.com/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz",
+      "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "quill": "^1.3.4"
+      }
+    },
     "vue-router": {
       "version": "3.0.2",
       "resolved": "http://registry.npm.taobao.org/vue-router/download/vue-router-3.0.2.tgz",
diff --git a/package.json b/package.json
index 9069d1d..465d283 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,14 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@tinymce/tinymce-vue": "^3.0.1",
     "axios": "^0.18.0",
-    "element-ui": "^2.4.5",
+    "D": "^1.0.0",
+    "element-ui": "^2.15.6",
     "node_module": "^0.0.0",
+    "tinymce": "^5.0.16",
     "vue": "^2.5.22",
+    "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.1"
   },
   "devDependencies": {
diff --git a/public/index.html b/public/index.html
index 20fab4f..9df6878 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>鏂扮綉涓庝紶鎾闄㈢綉绔�</title>
+    <title>鏂伴椈涓庝紶鎾闄㈢綉绔�</title>
   </head>
   <body>
     <noscript>
diff --git a/src/api/api.js b/src/api/api.js
index 4f9856f..d8f69ae 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1,28 +1,33 @@
 //鐢ㄤ簬鍐欐帴鍙�
-//post璇锋眰鍙傛暟鏀惧湪data閲岄潰锛実et璇锋眰鍙傛暟鏀惧湪params閲岃竟
 
 import request from "../utils/request";
-// 瀵艰埅鏍忓垪琛�
-export const getNavList = data => {
-  return request({
-    method: 'GET',
-    url: '/contype/findList',
-    params:data,
-  })
-}
+// // 瀵艰埅鏍忓垪琛�
+// export const getNavList = data => {
+//   return request({
+//     method: 'GET',
+//     url: '/news_type/all',
+//     params:data,
+//   })
+// }
 //鑾峰彇灏忔爣棰�
 export const getMinTitle = data => {
   return request({
-    method: 'POST',
-    url: '/category/findCategoryIdByContypeId',
-    data,
+    method: 'GET',
+    url: `/news_category/list/${data}`,
   })
 }
 //鑾峰彇鏂伴椈鍒楄〃
 export const getNewsList = data => {
   return request({
     method: 'POST',
-    url: '/newsTheme/findByTypeIdAndCategoryId',
-    data,
+    url:'/news/list',
+    params:data,
+  })
+}
+//鑾峰彇鍙湁涓�绡囨柊闂�
+export const getnew = data => {
+  return request({
+    method: 'GET',
+    url:`/news/main/${data}`
   })
 }
\ No newline at end of file
diff --git a/src/assets/404.gif b/src/assets/404.gif
new file mode 100644
index 0000000..539079d
--- /dev/null
+++ b/src/assets/404.gif
Binary files differ
diff --git a/src/assets/css/my_style.css b/src/assets/css/my_style.css
index 2e72188..8f31cec 100644
--- a/src/assets/css/my_style.css
+++ b/src/assets/css/my_style.css
@@ -20,6 +20,9 @@
 .marr10{
   margin-right: 10px !important;
 }
+.marb5{
+  margin-bottom: 5px !important;
+}
 .marb10{
   margin-bottom: 10px !important;
 }
@@ -58,4 +61,8 @@
 /* 钃濊壊鏍囬 */
 .color {
   color: rgb(1, 72, 153);
+}
+/* 鍙樺皬鎵� */
+.cursor{
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/src/assets/head.png b/src/assets/head.png
new file mode 100644
index 0000000..a3db0cf
--- /dev/null
+++ b/src/assets/head.png
Binary files differ
diff --git a/src/components/Administrator/AdminHome.vue b/src/components/Administrator/AdminHome.vue
new file mode 100644
index 0000000..2badd5d
--- /dev/null
+++ b/src/components/Administrator/AdminHome.vue
@@ -0,0 +1,65 @@
+<template>
+  <el-container class="home-container">
+    <el-header>
+      <div>
+        <img src="../../assets/head.png" alt="" />
+        <span>鍚庡彴绠$悊绯荤粺</span>
+      </div>
+      <el-button type="info" @click="logout">閫�鍑�</el-button>
+    </el-header>
+    <el-container>
+      <el-main>
+        <router-view></router-view>
+      </el-main>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+    logout() {
+      //娓呯┖token
+      window.sessionStorage.clear()
+      //璺宠浆鍒扮櫥褰曢〉
+      this.$router.push('/login')
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.home-container {
+  height: 100%;
+}
+.el-header {
+  background-color: rgb(55, 61, 63);
+  display: flex;
+  justify-content: space-between;
+  padding-left: 0;
+  align-items: center;
+  color: #fff;
+  font-size: 20px;
+  > div {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    span {
+      margin-left: 15px;
+    }
+  }
+}
+.el-main {
+  background-color: rgb(233, 237, 240);
+}
+
+.iconfont {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/components/Administrator/Edit.vue b/src/components/Administrator/Edit.vue
new file mode 100644
index 0000000..94447f1
--- /dev/null
+++ b/src/components/Administrator/Edit.vue
@@ -0,0 +1,33 @@
+<template>
+  <div>
+    <quill-editor ref="text" v-model="content" class="myQuillEditor" :options="editorOption" />
+    <el-button type="primary" @click="submit">鎻愪氦</el-button>
+  </div>
+</template>
+<script>
+import { quillEditor } from 'vue-quill-editor'
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+export default {
+  components:{ quillEditor },
+  data () {
+    return {
+      content: '',
+      editorOption: {} ,
+    }
+  },
+  methods: {
+    submit () {
+      console.log(this.$refs.text.value)
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+// .myQuillEditor{
+//   height: 400px;
+// }
+
+</style>
\ No newline at end of file
diff --git a/src/components/Administrator/Main.vue b/src/components/Administrator/Main.vue
new file mode 100644
index 0000000..1db10c7
--- /dev/null
+++ b/src/components/Administrator/Main.vue
@@ -0,0 +1,247 @@
+<template>
+  <div>
+     <div class="block">
+      <el-cascader
+        v-model="value"
+        :options="options"
+        clearable
+        filterable
+        @change="handleChange">
+      </el-cascader>
+    </div>
+    <div>
+      <el-card class="box-card">
+        <el-button class="add" type="success" icon="el-icon-plus" @click="goEdit()">鐐瑰嚮鍦ㄨ鍒楄〃涓嬫坊鍔犱竴鏉℃柊闂�</el-button>
+        <el-table :data="tableData" border style="width: 100%" :header-cell-style="{textAlign: 'center'}" :cell-style="{ textAlign: 'center' }"
+        >
+          <!-- :header-cell-style="{textAlign: 'center'}"璁剧疆澶撮儴灞呬腑锛� -->
+          <!-- :cell-style="{ textAlign: 'center' }"璁剧疆鏁翠釜琛ㄦ牸鍐呭姘村钩灞呬腑锛� -->
+          <!-- 闂锛氭�庝箞鑾峰彇鏁扮粍涓瘡涓璞$殑key鍊硷紙姣忔潯鏂伴椈鐨刬d锛�?
+               瑙e喅锛氶�氳繃浣滅敤鍩熸彃妲� slot-scope 鑾峰彇姣忎釜瀵硅薄 -->
+          <el-table-column type="index"></el-table-column>
+          <el-table-column prop="releaseTime" label="鏃ユ湡" width="" >
+          </el-table-column>
+          <el-table-column prop="title" label="鏂伴椈鏍囬" width="">
+          </el-table-column>
+          <el-table-column prop="id" label="id" width="">
+          </el-table-column>
+          <el-table-column label="鎿嶄綔" width="">
+            <template slot-scope="scope">
+              <!-- {{ scope.row.id }} -->
+              <div>
+                <el-button type="success" @click="look(scope.row.id)">鏌ョ湅</el-button>
+                <el-button type="warning" @click="amend(scope.row.id)">淇敼</el-button>&nbsp
+                <el-popconfirm
+                  confirm-button-text='鏄殑'
+                  cancel-button-text='鍙栨秷'
+                  icon="el-icon-info"
+                  icon-color="red"
+                  title="纭畾鍒犻櫎璇ユ潯鏂伴椈锛�"
+                >
+                  <el-button slot="reference">鍒犻櫎</el-button>
+                </el-popconfirm>
+              </div>
+            </template>
+            
+          </el-table-column>
+        </el-table>
+        <!-- 鍒嗛〉 -->
+          <div>
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[3,6,12, 18,]"
+              :page-size="100"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+            </el-pagination>
+          </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getNewsList } from '../../api/api'
+import axios from 'axios'
+export default {
+  data() {
+    return {
+      visible: false,
+      newsCategoryId:1, //鍏堝瓨涓�涓皬鏍囬id
+      tableData:[],   //鏂伴椈鍒楄〃瀵硅薄
+      pageSize:6,     //姣忛〉鏉℃暟
+      currentPage:1,  //褰撳墠椤�
+      newsList:[],
+      total:0,        //鏂伴椈鎬绘潯鏁�
+      value: [],
+      options: [{
+        value: 1,
+        label: '棣栭〉',
+        children: [{
+          value:42,
+          label: '閫氱煡鍏憡',
+        }, 
+        {
+          value:43,
+          label: '宸ヤ綔鍔ㄦ��',
+        },
+        {
+          value:44,
+          label: '瀛﹂櫌鍔ㄦ��',
+        }],
+      },{
+          value: 22,
+          label: '绉戝崗姒傚喌',
+          children: [{
+            value:27,
+            label: '绠�浠�',
+          }, 
+          {
+            value:28,
+            label: '绔犵▼',
+          },
+          {
+            value:29,
+            label: '缁勭粐缁撴瀯',
+          },
+          {
+            value:30,
+            label: '宸ヤ綔鑱岃矗',
+          },
+          {
+            value:31,
+            label: '涓撹亴浜哄憳',
+          }],
+        },
+        {
+          value: 23,
+          label: '鏀跨瓥娉曡',
+          children: [{
+            value:35,
+            label: '涓浗绉戝崗鏀跨瓥鏂囦欢',
+          }, 
+          {
+            value:36,
+            label: '鍦版柟绉戝崗鏀跨瓥鏂囦欢',
+          },
+          {
+            value:37,
+            label: '绀惧洟绠$悊鏂囦欢',
+          }],
+        },
+        {
+          value: 25,
+          label: '瀛︽湳浜ゆ祦',
+          children: [{
+            value:38,
+            label: '瀛︽湳淇℃伅',
+          }, 
+          {
+            value:39,
+            label: '绉戞妧绔炶禌',
+          }],
+        },
+        {
+          value: 27,
+          label: '绉戞櫘椋庨噰',
+          children: [{
+            value:40,
+            label: '骞抽《灞卞闄㈢鏅椿鍔�',
+          }, 
+          {
+            value:41,
+            label: '骞抽《灞卞競鏀垮崗绉戞櫘娲诲姩',
+          }],
+      }]
+    }
+  },
+  created(){
+  },
+  mounted(){
+  },
+  methods: {
+    handleChange(value) {
+      console.log(value);
+      console.log(value[1]);
+      this.newsCategoryId = value[1]; //灏嗗緱鍒扮殑灏忔爣棰榠d瀛樻斁璧锋潵
+      this.query(this.newsCategoryId);
+    },
+    // query(value){
+    //   const data = {
+    //     current:this.currentPage,
+    //     newsCategoryId:value[1],
+    //     size:this.pageSize
+    //   };
+    //   getNewsList(data).then(res=>{
+    //     console.log(res);
+    //     this.tableData = res.data.records
+    //     this.total = res.data.total
+    //   }).catch(err => {
+    //     console.log(err);
+    //   })
+    // },
+    query(newsCategoryId){
+      const data = {
+        current:this.currentPage,
+        newsCategoryId:newsCategoryId,
+        size:this.pageSize
+      };
+      getNewsList(data).then(res=>{
+        console.log(res);
+        if (res.code !== 200) {
+          return this.$message.error('鑾峰彇鏂伴椈鍒楄〃澶辫触')
+        }else{
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    //淇敼
+    amend(id){
+      alert('鐖变綘鍛�');
+      console.log('>>>'+id);
+    },
+    //鏌ョ湅
+    look(id){
+      this.$router.push({path:'news',query:{id:id}})
+    },
+    handleCurrentChange(val) {
+      // console.log(`褰撳墠椤�: ${val}`);
+      this.currentPage = val;
+      this.query(this.newsCategoryId)
+    },
+    handleSizeChange(val) {
+      // console.log(`姣忛〉 ${val} 鏉);
+      this.pageSize = val;
+      this.query(this.newsCategoryId)
+    },
+    //鍘诲線娣诲姞缂栬緫椤甸潰
+    goEdit(){
+      if (this.newsCategoryId==27||this.newsCategoryId==28||this.newsCategoryId==29||
+      this.newsCategoryId==30||this.newsCategoryId==31) {
+        this.$message.error('璇ユ柊闂绘爣棰樹笅涓嶈兘娣诲姞鏂伴椈')
+      }else if(this.newsCategoryId == 35||this.newsCategoryId==36||this.newsCategoryId==37||
+      this.newsCategoryId==38||this.newsCategoryId==39||this.newsCategoryId==40||
+      this.newsCategoryId==41||this.newsCategoryId==42||this.newsCategoryId==43||
+      this.newsCategoryId==44){
+        this.$router.push('/administrator/edit')
+      }else{
+        this.$message.error('璇峰厛閫夋嫨鏂伴椈鏍囬')
+      } 
+    }
+  },
+}
+</script>
+
+<style lang="less">
+.add{
+  margin-bottom: 10px !important;
+}
+.el-pagination{
+  margin-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Administrator/Welcome.vue b/src/components/Administrator/Welcome.vue
new file mode 100644
index 0000000..b46f470
--- /dev/null
+++ b/src/components/Administrator/Welcome.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <h2>娆㈣繋杩涘叆鍚庡彴绠$悊绯荤粺</h2>
+  </div>
+
+</template>
+
+<script>
+
+
+export default {
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Home.vue b/src/components/Home.vue
index b2af2cb..7bafe07 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -13,7 +13,7 @@
     <el-row>
       <el-menu mode="horizontal" background-color="rgb(64, 112, 186)" text-color="white" class="menu" active-text-color="#000000" :default-active="activeIndex" @select="handleSelect">
         <el-menu-item :key="index" v-for="(item, index) in menuList" :index="(item.id).toString()">
-          {{ item.contypeName }}
+          {{ item.name }}
         </el-menu-item>
       </el-menu>
     </el-row>
@@ -29,20 +29,30 @@
 
 <script>
 import {getNavList} from '../api/api'
+import axios from 'axios'
 export default {
   name: '',
   data() {
     return {
       activeIndex: '1',
-      menuList: [{contypeName: '棣栭〉',id: 1},{contypeName: '绉戝崗姒傚喌',id: 2},{contypeName: '鏀跨瓥娉曡',id: 3},{contypeName: '绉戝崗椤圭洰',id: 4},
-      {contypeName: '瀛︽湳浜ゆ祦',id: 5},{contypeName: '鍔炰簨鎸囧崡',id: 6},{contypeName: '绉戞櫘椋庨噰',id: 7},{contypeName: '瀛︽牎棣栭〉',id: 8},
-      {contypeName: '鑱旂郴鎴戜滑',id: 9}],
+      menuList: [{name: '棣栭〉',id: 1},{name: '绉戝崗姒傚喌',id: 22},{name: '鏀跨瓥娉曡',id: 23},{name: '绉戝崗椤圭洰',id: 24},
+      {name: '瀛︽湳浜ゆ祦',id: 25},{name: '鍔炰簨鎸囧崡',id: 26},{name: '绉戞櫘椋庨噰',id: 27},{name: '瀛︽牎棣栭〉',id: 28},
+      {name: '鑱旂郴鎴戜滑',id: 29}],
+      menuList2:[]
     }
   },
   created() {
     // this.getNavArr();
   },
-  mounted() {},
+  mounted() {
+    let api3 = 'http://localhost:8080/news_type/all'
+    axios.get(api3).then((res)=>{
+      // console.log(res);
+      this.menuList2 = res.data.data
+    }).catch((error)=>{
+      console.log(error);
+    })
+  },
   watch: {},
   methods: {
     // //鑾峰彇瀵艰埅鏍�
@@ -51,37 +61,38 @@
     //   getNavList(data).then(res => {
     //     console.log('res', res)
     //     if(res.code == 200){
-    //       this.menuList = res.data
+    //       this.menuList2 = res.data.data
     //     }
+    //     this.menuList2 = res.data.data
     //   }).catch(err => {
     //     console.log('err', err)
     //   })
     // },
-
+    
     formatterTitle(t){
       switch(t){
         case '1':
           return 'index'
-        case '2':
+        case '22':
           return 'introduce'
-        case '3':
+        case '23':
           return 'zhengce'
-        case '4':
+        case '24':
           return 'keXieXiangMu'
-        case '5':
+        case '25':
           return 'xueShuJiaoLiu'
-        case '6':
+        case '26':
           return 'banShiZhiNan'
-        case '7':
+        case '27':
           return 'kePuFengCai'
-        case '8':
+        case '28':
           return 'xueXiaoShouYe'
-        case '9':
+        case '29':
           return 'telephone'
       }
     },
     handleSelect(key, keyPath) {
-      if (key == '8') {
+      if (key == '28') {
         window.open('https://www.pdsu.edu.cn/#')
       } else {
         this.$router.push({
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 3fe96b6..48999ed 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -6,27 +6,14 @@
         <img src="../assets/logo.png" alt="" />
       </div>
       <!-- 鐧诲綍琛ㄥ崟鍖哄煙 -->
-      <el-form
-        ref="loginFormRef"
-        :model="loginForm"
-        :rules="loginFormRules"
-        label-width="0px"
-        class="login_form"
-      >
+      <el-form ref="loginFormRef" :model="loginForm" :rules="loginFormRules" label-width="0px" class="login_form">
         <!-- 鐢ㄦ埛鍚� -->
-        <el-form-item prop="account">
-          <el-input
-            v-model="loginForm.account"
-            prefix-icon="iconfont icon-user"
-          ></el-input>
+        <el-form-item prop="username">
+          <el-input v-model="loginForm.username" prefix-icon="iconfont icon-user"></el-input>
         </el-form-item>
         <!-- 瀵嗙爜 -->
         <el-form-item prop="password">
-          <el-input
-            v-model="loginForm.password"
-            prefix-icon="iconfont icon-3702mima"
-            type="password"
-          ></el-input>
+          <el-input v-model="loginForm.password" prefix-icon="iconfont icon-3702mima" type="password"></el-input>
         </el-form-item>
         <!-- 鎸夐挳鍖哄煙 -->
         <el-form-item class="btns">
@@ -44,30 +31,20 @@
     return {
       // 杩欐槸鐧诲綍琛ㄥ崟鐨勬暟鎹粦瀹氬璞�
       loginForm: {
-        account: '181360226',
-        password: 'pyb***20000112'
+        username: 'admin',
+        password: '123456'
       },
       // 杩欐槸琛ㄥ崟鐨勯獙璇佽鍒欏璞�
       loginFormRules: {
         // 楠岃瘉鐢ㄦ埛鍚嶆槸鍚﹀悎娉�
-        account: [
+        username: [
           { required: true, message: '璇疯緭鍏ョ櫥褰曞悕绉�', trigger: 'blur' },
-          {
-            min: 3,
-            max: 10,
-            message: '闀垮害鍦� 3 鍒� 10 涓瓧绗�',
-            trigger: 'blur'
-          }
+          { min: 3, max: 10, message: '闀垮害鍦� 3 鍒� 10 涓瓧绗�', trigger: 'blur'}
         ],
         // 楠岃瘉瀵嗙爜鏄惁鍚堟硶
         password: [
           { required: true, message: '璇疯緭鍏ョ櫥褰曞瘑鐮�', trigger: 'blur' },
-          {
-            min: 6,
-            max: 15,
-            message: '闀垮害鍦� 6 鍒� 15 涓瓧绗�',
-            trigger: 'blur'
-          }
+          { min: 6, max: 15, message: '闀垮害鍦� 6 鍒� 15 涓瓧绗�', trigger: 'blur'}
         ]
       }
     }
@@ -80,9 +57,10 @@
     login() {
       this.$refs.loginFormRef.validate(async (valid) => {
         if (!valid) return
-        const { data: res } = await this.$http.post('login', this.loginForm)
+        const { data: res } = await this.$http.post('/login', this.loginForm)
+        console.log('12312123123123123')
         console.log(res)
-        if (res.code !== 200) return this.$message.error('鐧诲綍澶辫触锛�')
+        if (res.meta.status !== 200) return this.$message.error('鐧诲綍澶辫触锛�')
         this.$message.success('鐧诲綍鎴愬姛')
         // console.log(res)
         // 1. 灏嗙櫥褰曟垚鍔熶箣鍚庣殑 token锛屼繚瀛樺埌瀹㈡埛绔殑 sessionStorage 涓�
@@ -90,7 +68,7 @@
         //   1.2 token 鍙簲鍦ㄥ綋鍓嶇綉绔欐墦寮�鏈熼棿鐢熸晥锛屾墍浠ュ皢 token 淇濆瓨鍦� sessionStorage 涓�
         window.sessionStorage.setItem('token', res.data.token)
         // 2. 閫氳繃缂栫▼寮忓鑸烦杞埌鍚庡彴涓婚〉锛岃矾鐢卞湴鍧�鏄� /home
-        this.$router.push('/home')
+        this.$router.push('/administrator')
       })
     }
   }
diff --git a/src/components/NotFound.vue b/src/components/NotFound.vue
new file mode 100644
index 0000000..c329452
--- /dev/null
+++ b/src/components/NotFound.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="center">
+    <img src="../assets/404.gif" alt="">
+  </div>
+</template>
+
+<script>
+export default {
+};
+</script>
+
+<style scoped>
+.center{
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%);
+}
+img{
+  width: 300px;
+}
+</style>
diff --git a/src/components/page/News.vue b/src/components/page/News.vue
new file mode 100644
index 0000000..45a88dc
--- /dev/null
+++ b/src/components/page/News.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="box">
+    <!-- <p>{{ this.$route.query.id }}</p> -->
+    <div class="header">
+      <h2>{{ title }}</h2>
+      <p>鍙戝竷鏃ユ湡锛歿{ releaseTime }} 鐐瑰嚮閲忥細[ {{hits}} ]</p>
+    </div>
+    <hr>
+    <div v-html="content"></div>
+  </div>
+</template>
+<script>
+import {getnew} from '../../api/api'
+export default {
+  name:'noticeMessage',
+  data(){
+    return {
+      content:'',
+      hits:'',
+      releaseTime:'',
+      title:''
+    }
+  },
+  created(){
+    console.log(">>>>>>>>",this.$route.query.id);
+    this.getalone();
+    // this.queryAll();
+  },
+  methods:{
+    getalone(){
+      const data = this.$route.query.id;
+      getnew(data).then(res => {
+        console.log(res);
+        this.content = res.data.content;
+        this.hits = res.data.hits;
+        this.releaseTime = res.data.releaseTime;
+        this.title = res.data.title;
+      })
+    },
+    // queryAll(){
+    //   this.content = ``
+    // }
+  }
+}
+</script>
+<style>
+h2{
+  color: rgb(3, 73, 144);
+  text-align: center;
+}
+p{
+  background-color: rgb(246, 246, 246);
+  text-align: center;
+  height: 35px;
+  line-height: 35px;
+}
+.box {
+  width: 1200px;
+  margin: 0 auto;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/page/index.vue b/src/components/page/index.vue
index 44e986d..e7f3a9b 100644
--- a/src/components/page/index.vue
+++ b/src/components/page/index.vue
@@ -3,7 +3,7 @@
     <!-- 棣栭〉涓婂崐閮ㄥ垎 -->
     <el-row type="flex" class="row-bg" justify="space-between">
         <div class="block marr10">
-          <el-carousel height="460px"  arrow="always" :interval="2000">
+          <el-carousel height="460px"  arrow="always" :interval="3000">
             <el-carousel-item v-for="(item,index) in imgList" :key="index">
               <div>
                 <img :src="item.path"  alt="" style="width:105%;">
diff --git a/src/components/page/introduce.vue b/src/components/page/introduce.vue
index 65b8123..9fb6ac3 100644
--- a/src/components/page/introduce.vue
+++ b/src/components/page/introduce.vue
@@ -7,41 +7,20 @@
       <!-- 灏忔爣棰� -->
       <el-col :span="4" class="marr10">
         <ul>
-          <li
-            v-for="(item, index) in menuList"
-            :key="index"
-            class="liStylenone liPointer marb10"
-            @click="changeMenu(item)"
-          >
-            <b :class="cont == item.categoryName ? 'ft-blue' : 'ft-black'">{{
-              item.categoryName
-            }}</b>
+          <li v-for="(item, index) in menuList" :key="index" class="liStylenone liPointer marb10" @click="changeMenu(item)">
+            <b :class="cont == item.name ? 'ft-blue' : 'ft-black'">{{item.name}}</b>
           </li>
         </ul>
       </el-col>
        <!-- 鏂伴椈鍐呭 -->
       <el-card class="box-card">
         <el-col :span="18">
-          <div>
-            <el-row
-              class="marb10"
-              :key="index"
-              v-for="(item, index) in newsList"
-            >
+          <!-- <div v-if="newsList.length > 0">
+            <el-row class="marb10" :key="index" v-for="(item, index) in newsList">
               {{ item.title }}
             </el-row>
-          </div>
-          <!-- 鍒嗛〉 -->
-          <div>
-            <el-pagination
-              @current-change="handleCurrentChange"
-              :current-page.sync="currentPage"
-              :page-size="20"
-              layout="total, pager, next"
-              :total="total"
-            >
-            </el-pagination>
-          </div>
+          </div> -->
+          <div>{{ content }}</div>
         </el-col>
       </el-card>
     </el-row>
@@ -50,7 +29,7 @@
 
 <script>
 import globalTitle from '../globalTitle.vue'
-import { getMinTitle, getNewsList } from '../../api/api'
+import {getMinTitle,getNewsList,getnew} from '../../api/api'
 export default {
   name: 'introduce',
   components: {
@@ -60,62 +39,66 @@
     return {
       cont: '',
       menuList: [],
-      newsList: [],
-      total: 0,
-      currentPage: 1
+      newsList:[],
+      content:'',
     }
   },
   created() {
-    this.getMinTitleList()
   },
-  mounted() {},
+  mounted() {
+    this.getTitle();
+  },
   watch: {
-    menuList(newval, oldval) {
-      this.getAllNewsList(this.menuList[0])
-      this.cont = this.menuList[0].categoryName
+    menuList(n,o){
+      this.cont =  this.menuList[0].name;
+      this.getnews(this.menuList[0]);
+      this.getalone(this.newsList);
     }
   },
   methods: {
-    handleCurrentChange(val) {
-      console.log(`褰撳墠椤�: ${val}`)
+    getTitle(){
+      const data = Number(this.$route.query.id);
+      getMinTitle(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.menuList = res.data
+        }
+      }).catch(err => {
+        console.log(err);
+      })
     },
     changeMenu(val) {
-      this.getAllNewsList(val)
-      this.cont = val.categoryName
+      this.cont = val.name;
+      this.getnews(val)
     },
-    getMinTitleList() {
+    getnews(item){
       const data = {
-        contypeId: this.$route.query.id,
-        p: 1
-      }
-      getMinTitle(data)
-        .then((res) => {
-          console.log('res', res)
-          if (res.code == 200) {
-            this.menuList = res.data.records
-          }
-        })
-        .catch((err) => {
-          console.log('err', err)
-        })
+        current:1,
+        newsCategoryId:item.id,
+        size:5
+      };
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          // if(res.data.records.length == 1){
+            this.newsList = [];
+            this.getalone(res.data.records[0]);
+          // }else{
+          //   this.content = '';
+          //   this.newsList = res.data.records
+          // }
+        }
+      }).catch(error => {
+        console.log(error);
+      })
     },
-    getAllNewsList(item) {
-      const data = {
-        categoryId: item.id,
-        contypeId: item.contypeId,
-        p: this.currentPage
-      }
-      getNewsList(data)
-        .then((res) => {
-          console.log('res', res)
-          if (res.code == 200) {
-            this.newsList = res.data.records
-            this.total = Number(res.data.total)
-          }
-        })
-        .catch((err) => {
-          console.log('err', err)
-        })
+    getalone(item){
+      const data = item.id;
+      getnew(data).then(res => {
+        console.log(">>>>",res);
+        this.content = res.data.content;
+        this.data = res.data;
+      })
     }
   }
 }
diff --git a/src/components/page/kePuFengCai.vue b/src/components/page/kePuFengCai.vue
index c098ec2..cd9c1be 100644
--- a/src/components/page/kePuFengCai.vue
+++ b/src/components/page/kePuFengCai.vue
@@ -7,15 +7,8 @@
       <!-- 灏忔爣棰� -->
       <el-col :span="4" class="marr10">
         <ul>
-          <li
-            v-for="(item, index) in menuList"
-            :key="index"
-            class="liStylenone liPointer marb10"
-            @click="changeMenu(item)"
-          >
-            <b :class="cont == item.categoryName ? 'ft-blue' : 'ft-black'">{{
-              item.categoryName
-            }}</b>
+          <li v-for="(item, index) in menuList" :key="index" class="liStylenone liPointer marb10" @click="changeMenu(item)">
+            <b :class="cont == item.name ? 'ft-blue' : 'ft-black'">{{item.name}}</b>
           </li>
         </ul>
       </el-col>
@@ -23,23 +16,22 @@
       <el-card class="box-card">
         <el-col :span="18">
           <div>
-            <el-row
-              class="marb10"
-              :key="index"
-              v-for="(item, index) in newsList"
-            >
-              {{ item.title }}
+            <el-row class="marb10" :key="index" v-for="(item, index) in newsList">
+              <div class="flex-v flex-between marb5 cursor" @click="show(item)">
+                <div>{{ item.title }}</div>
+                <div>{{ item.releaseTime }}</div>
+              </div>
             </el-row>
           </div>
           <!-- 鍒嗛〉 -->
-          <div>
+          <div class="fenye">
             <el-pagination
+              background
               @current-change="handleCurrentChange"
               :current-page.sync="currentPage"
-              :page-size="20"
-              layout="total, pager, next"
-              :total="total"
-            >
+              :page-size="pageSize"
+              layout="prev, pager, next,total"
+              :total="total">
             </el-pagination>
           </div>
         </el-col>
@@ -47,78 +39,81 @@
     </el-row>
   </div>
 </template>
+
 <script>
 import globalTitle from '../globalTitle.vue'
 import { getMinTitle, getNewsList } from '../../api/api'
 export default {
-  name: 'kePuFengCai',
-  components: {
-    globalTitle
-  },
+  components: { globalTitle },
+  name: 'xueShuJiaoLiu',
   data() {
     return {
       cont: '',
       menuList: [],
-      newsList: [],
-      total: 0,
-      currentPage: 1
+      newsList:[],
+      pageSize:2,
+      currentPage:1,
+      total:0,
+      item:{},
     }
   },
   created() {
-    this.getMinTitleList()
   },
-  mounted() {},
+  mounted() {
+    this.getTitle();
+  },
   watch: {
-    menuList(newval, oldval) {
-      this.getAllNewsList(this.menuList[0])
-      this.cont = this.menuList[0].categoryName
+    menuList(n,o){
+      this.cont =  this.menuList[0].name
+      this.getnews(this.menuList[0]);
     }
   },
   methods: {
     handleCurrentChange(val) {
-      console.log(`褰撳墠椤�: ${val}`)
+      console.log(`褰撳墠椤�: ${val}`);
+      this.getnews(this.item);
+    },
+    getTitle(){
+      const data = Number(this.$route.query.id);
+      getMinTitle(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.menuList = res.data
+        }
+      }).catch(err => {
+        console.log(err);
+      })
     },
     changeMenu(val) {
-      this.getAllNewsList(val)
-      this.cont = val.categoryName
+      this.cont = val.name
+      this.item = val
+      this.currentPage = 1
+      this.getnews(val);
     },
-    getMinTitleList() {
+    getnews(item){
       const data = {
-        contypeId: this.$route.query.id,
-        p: 1
-      }
-      getMinTitle(data)
-        .then((res) => {
-          console.log('res', res)
-          if (res.code == 200) {
-            this.menuList = res.data.records
-          }
-        })
-        .catch((err) => {
-          console.log('err', err)
-        })
+        current:this.currentPage,
+        newsCategoryId:item.id,
+        size:this.pageSize
+      };
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.newsList = res.data.records
+          this.total =  Number(res.data.total)
+        }
+      }).catch(error => {
+        console.log(error);
+      })
     },
-    getAllNewsList(item) {
-      const data = {
-        categoryId: item.id,
-        contypeId: item.contypeId,
-        p: this.currentPage
-      }
-      getNewsList(data)
-        .then((res) => {
-          console.log('res', res)
-          if (res.code == 200) {
-            this.newsList = res.data.records
-            this.total = Number(res.data.total)
-          }
-        })
-        .catch((err) => {
-          console.log('err', err)
-        })
+    show(item){
+      // console.log(item.id);
+      this.$router.push({path:'/home/news',query:{id:item.id}})
     }
   }
 }
 </script>
+
 <style lang="less" scoped>
 ul {
   width: 200px;
@@ -135,4 +130,12 @@
 .ft-black {
   color: #000;
 }
-</style>
+.box-card{
+  height: 600px;
+  position: relative;
+  .fenye{
+    position: absolute;
+    bottom: 2px;
+  }
+} 
+</style>
\ No newline at end of file
diff --git a/src/components/page/keXieXiangMu.vue b/src/components/page/keXieXiangMu.vue
index 429b27c..6071204 100644
--- a/src/components/page/keXieXiangMu.vue
+++ b/src/components/page/keXieXiangMu.vue
@@ -1,47 +1,28 @@
 <template>
   <div>
-    <globalTitle />
+    <globalTitle/>
     <div>
-      <!-- 椤圭洰灞曠ず鍖� -->
-      <el-table :data="tableData" style="width: 100%" border stripe>
-        <el-table-column
-          type="index"
-          label="搴忓彿"
-          width="80px"
-        ></el-table-column>
-        <el-table-column
-          prop="lixiangbianhao"
-          label="绔嬮」缂栧彿"
-        ></el-table-column>
-        <el-table-column
-          prop="xiangmumingcheng"
-          label="椤圭洰鍚嶇О"
-        ></el-table-column>
-        <el-table-column
-          prop="xiangmuxingshi"
-          label="椤圭洰褰㈠紡"
-        ></el-table-column>
-        <el-table-column
-          prop="xiangmufuzheren"
-          label="椤圭洰璐熻矗浜�"
-        ></el-table-column>
-        <el-table-column
-          prop="jiexiangshijian"
-          label="缁撻」鏃堕棿"
-        ></el-table-column>
-        <el-table-column prop="beizhu" label="澶囨敞"></el-table-column>
-      </el-table>
-      <!-- 鍒嗛〉瀵艰埅鏍� -->
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="queryInfo.pagenum"
-        :page-sizes="[1, 5, 8, 10]"
-        :page-size="queryInfo.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination>
+      <el-card class="mart10">
+        <h4>骞抽《灞卞闄�2021骞村害娌冲崡鐪佺鍗忕珛椤瑰垪琛�</h4>
+        <el-table :data="tableData" border style="width: 100%" :header-cell-style="{textAlign: 'center'}" :cell-style="{ textAlign: 'center' }">
+          <!-- :header-cell-style="{textAlign: 'center'}"璁剧疆澶撮儴灞呬腑锛� -->
+          <!-- :cell-style="{ textAlign: 'center' }"璁剧疆鏁翠釜琛ㄦ牸鍐呭姘村钩灞呬腑锛� -->
+          <el-table-column prop="id" label="搴忓彿" width="" >
+          </el-table-column>
+          <el-table-column prop="bianhao" label="绔嬮」缂栧彿" width="">
+          </el-table-column>
+          <el-table-column prop="name" label="椤圭洰鍚嶇О">
+          </el-table-column>
+          <el-table-column prop="xingshi" label="椤圭洰褰㈠紡">
+          </el-table-column>
+          <el-table-column prop="fuzeren" label="椤圭洰璐熻矗浜�">
+          </el-table-column>
+          <el-table-column prop="time" label="缁撻」鏃堕棿">
+          </el-table-column>
+          <el-table-column prop="beizhu" label="澶囨敞">
+          </el-table-column>
+        </el-table>
+      </el-card>
     </div>
   </div>
 </template>
@@ -53,130 +34,36 @@
   name: 'keXieXiangMu',
   data() {
     return {
-      tableData: [
-        {
-          lixiangbianhao: '1',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '2',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '3',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '4',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '5',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '6',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '7',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '8',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '9',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        },
-        {
-          lixiangbianhao: '10',
-          xiangmumingcheng: '骞抽《灞卞闄㈢瀛︽妧鏈崗浼氬畼缃戞惌寤�',
-          xiangmuxingshi: '607瀹為獙瀹ゆ瀯寤�',
-          xiangmufuzheren: '鍠绘亽',
-          jiexiangshijian: '2021-12-31',
-          beizhu: '绉戞妧妤糞607'
-        }
-      ],
-      // 鑾峰彇鐢ㄦ埛鍒楄〃鐨勫弬鏁板璞�
-      queryInfo: {
-        query: '',
-        // 褰撳墠椤垫暟
-        pagenum: 1,
-        // 褰撳墠姣忛〉鏄剧ず澶氬皯鏉℃暟鎹�
-        pagesize: 2
-      },
-      userlist: [],
-      total: 0
+      tableData:[{id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+        {id:1,bianhao:'001',name:'鑻规灉',xingshi:'绾夸笂鎿嶄綔',fuzeren:'鑰佹潹',time:'2022-1-8',beizhu:'鏃�'},
+      ]
     }
   },
   created() {
-    this.getUserList()
   },
   methods: {
-    async getUserList() {
-      const { data: res } = await this.$http.get('users', {
-        params: this.queryInfo
-      })
-      if (res.meta.status !== 200) {
-        return this.$message.error('鑾峰彇鐢ㄦ埛鍒楄〃澶辫触锛� ')
-      }
-      this.userlist = res.data.users
-      this.total = res.data.total
-      console.log(res)
-    },
-
-    // 鐩戝惉pagesize鏀瑰彉鐨勪簨浠�
-    handleSizeChange(newSize) {
-      // console.log(newSize)
-      this.queryInfo.pagesize = newSize
-      this.getUserList()
-    },
-    // // 鐩戝惉 椤电爜鍊� 鏀瑰彉鐨勪簨浠�
-    handleCurrentChange(newPage) {
-      // console.log(newPage)
-      this.queryInfo.newpage = newPage
-    }
+    
   }
 }
 </script>
 
 <style lang="less" scoped>
+h4{
+  text-align: center;
+  margin-top: 0;
+}
+.mart10{
+  margin-top: 10px;
+}
 </style>
diff --git a/src/components/page/telephone.vue b/src/components/page/telephone.vue
index d3bc8e2..d043278 100644
--- a/src/components/page/telephone.vue
+++ b/src/components/page/telephone.vue
@@ -1,14 +1,36 @@
 <template>
   <div>
     <globalTitle />
-    <el-table :data="tableData" stripe style="width: 100%;">
-      <el-table-column type="index" label="搴忓彿" width="80px"></el-table-column>
-      <el-table-column prop="zhize" label="鑱岃矗" width="180"> </el-table-column>
-      <el-table-column prop="name" label="濮撳悕" width="180"> </el-table-column>
-      <el-table-column prop="tele" label="鑱旂郴鐢佃瘽" width="180">
-      </el-table-column>
-      <el-table-column prop="e" label="閭"> </el-table-column>
-    </el-table>
+    <el-card class="card">
+      <div class="max">
+        <div class="left">
+          <el-card style="" class="img">
+            <p>寰俊鍏紬鍙�</p>
+            <img src="../../assets/gongZhongHao.jpg" alt="">
+          </el-card>
+          <el-card style="" class="img">
+            <p>鏂版氮寰崥</p>
+            <img src="../../assets/weiBo.jpg" alt="">
+          </el-card>
+        </div>
+        <divc class="right">
+          <el-table :data="tableData" border  :header-cell-style="{textAlign: 'center'}" :cell-style="{ textAlign: 'center' }">
+            <!-- :header-cell-style="{textAlign: 'center'}"璁剧疆澶撮儴灞呬腑锛� -->
+            <!-- :cell-style="{ textAlign: 'center' }"璁剧疆鏁翠釜琛ㄦ牸鍐呭姘村钩灞呬腑锛� -->
+            <el-table-column prop="id" label="搴忓彿" width="60" >
+            </el-table-column>
+            <el-table-column prop="zhize" label="鑱岃矗" width="">
+            </el-table-column>
+            <el-table-column prop="name" label="濮撳悕">
+            </el-table-column>
+            <el-table-column prop="tel" label="鑱旂郴鐢佃瘽">
+            </el-table-column>
+            <el-table-column prop="mail" label="閭" width="200">
+            </el-table-column>
+          </el-table>  
+        </divc>
+      </div>
+    </el-card>
   </div>
 </template>
 
@@ -19,47 +41,39 @@
   name: 'telephone',
   data() {
     return {
-      tableData: [
-        {
-          zhize: '鏍$鍗忎富甯�',
-          name: '鐜嬪皬铏�',
-          tele: '17630124661',
-          e: '2345@qq.com'
-        },
-        {
-          zhize: '鏍$鍗忕涔﹂暱',
-          name: '鐜嬪皬铏�',
-          tele: '17630124661',
-          e: '2345@qq.com'
-        },
-        {
-          zhize: '鏍$鍗忚仈缁滃憳',
-          name: '鐜嬪皬铏�',
-          tele: '17630124661',
-          e: '2345@qq.com'
-        },
-        {
-          zhize: '闈掑勾鍒嗕細涓诲腑',
-          name: '鐜嬪皬铏�',
-          tele: '17630124661',
-          e: '2345@qq.com'
-        },
-        {
-          zhize: '瀛︾敓鍒嗕細鑱旂粶鍛�',
-          name: '鐜嬪皬铏�',
-          tele: '17630124661',
-          e: '2345@qq.com'
-        },
-        {
-          zhize: 'XXXXX',
-          name: 'XXX',
-          tele: '17630124661',
-          e: '2345@qq.com'
-        }
+      tableData:[{id:1,zhize:'鏍¢暱',name:'鏉ㄩ福',tel:'12345678910',mail:'12312312@qq.com'},
+        {id:1,zhize:'鏍¢暱',name:'鏉ㄩ福',tel:'12345678910',mail:'12312312@qq.com'},
+        {id:1,zhize:'鏍¢暱',name:'鏉ㄩ福',tel:'12345678910',mail:'12312312@qq.com'},
+        {id:1,zhize:'鏍¢暱',name:'鏉ㄩ福',tel:'12345678910',mail:'12312312@qq.com'},
+        {id:1,zhize:'鏍¢暱',name:'鏉ㄩ福',tel:'12345678910',mail:'12312312@qq.com'},
+        {id:1,zhize:'鏍¢暱',name:'鏉ㄩ福',tel:'12345678910',mail:'12312312@qq.com'},
       ]
     }
   }
 }
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.card{
+  margin-top: 10px;
+}
+.max{
+  display: flex;
+  justify-content: space-between;
+}
+p{
+  text-align: center;
+}
+.right{
+  width: 800px;
+}
+.left{
+  width: 200px;
+}
+.img{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/page/xueShuJiaoLiu.vue b/src/components/page/xueShuJiaoLiu.vue
index 3e0aad4..00d0150 100644
--- a/src/components/page/xueShuJiaoLiu.vue
+++ b/src/components/page/xueShuJiaoLiu.vue
@@ -7,15 +7,8 @@
       <!-- 灏忔爣棰� -->
       <el-col :span="4" class="marr10">
         <ul>
-          <li
-            v-for="(item, index) in menuList"
-            :key="index"
-            class="liStylenone liPointer marb10"
-            @click="changeMenu(item)"
-          >
-            <b :class="cont == item.categoryName ? 'ft-blue' : 'ft-black'">{{
-              item.categoryName
-            }}</b>
+          <li v-for="(item, index) in menuList" :key="index" class="liStylenone liPointer marb10" @click="changeMenu(item)">
+            <b :class="cont == item.name ? 'ft-blue' : 'ft-black'">{{item.name}}</b>
           </li>
         </ul>
       </el-col>
@@ -23,23 +16,22 @@
       <el-card class="box-card">
         <el-col :span="18">
           <div>
-            <el-row
-              class="marb10"
-              :key="index"
-              v-for="(item, index) in newsList"
-            >
-              {{ item.title }}
+            <el-row class="marb10" :key="index" v-for="(item, index) in newsList">
+              <div class="flex-v flex-between marb5 cursor" @click="show(item)">
+                <div>{{ item.title }}</div>
+                <div>{{ item.releaseTime }}</div>
+              </div>
             </el-row>
           </div>
           <!-- 鍒嗛〉 -->
-          <div>
+          <div class="fenye">
             <el-pagination
+              background
               @current-change="handleCurrentChange"
               :current-page.sync="currentPage"
-              :page-size="20"
-              layout="total, pager, next"
-              :total="total"
-            >
+              :page-size="pageSize"
+              layout="prev, pager, next,total"
+              :total="total">
             </el-pagination>
           </div>
         </el-col>
@@ -58,65 +50,66 @@
     return {
       cont: '',
       menuList: [],
-      newsList: [],
-      total: 0,
-      currentPage: 1
+      newsList:[],
+      pageSize:2,
+      currentPage:1,
+      total:0,
+      item:{},
     }
   },
   created() {
-    this.getMinTitleList()
   },
-  mounted() {},
+  mounted() {
+    this.getTitle();
+  },
   watch: {
-    menuList(newval, oldval) {
-      this.getAllNewsList(this.menuList[0])
-      this.cont = this.menuList[0].categoryName
+    menuList(n,o){
+      this.cont =  this.menuList[0].name
+      this.getnews(this.menuList[0]);
     }
   },
   methods: {
     handleCurrentChange(val) {
-      console.log(`褰撳墠椤�: ${val}`)
+      console.log(`褰撳墠椤�: ${val}`);
+      this.getnews(this.item);
     },
-    //鏀瑰彉 灏忔爣棰樿幏鍙栦笉鍚岀殑鏂伴椈鍐呭
+    getTitle(){
+      const data = Number(this.$route.query.id);
+      getMinTitle(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.menuList = res.data
+        }
+      }).catch(err => {
+        console.log(err);
+      })
+    },
     changeMenu(val) {
-      this.getAllNewsList(val)
-      this.cont = val.categoryName
+      this.cont = val.name
+      this.item = val
+      this.currentPage = 1
+      this.getnews(val);
     },
-    //鑾峰彇灏忔爣棰樺垪琛�
-    getMinTitleList() {
+    getnews(item){
       const data = {
-        contypeId: this.$route.query.id,
-        p: 1
-      }
-      getMinTitle(data)
-        .then((res) => {
-          console.log('res', res)
-          if (res.code == 200) {
-            this.menuList = res.data.records
-          }
-        })
-        .catch((err) => {
-          console.log('err', err)
-        })
+        current:this.currentPage,
+        newsCategoryId:item.id,
+        size:this.pageSize
+      };
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.newsList = res.data.records
+          this.total =  Number(res.data.total)
+        }
+      }).catch(error => {
+        console.log(error);
+      })
     },
-    //鑾峰彇鏂伴椈鍒楄〃
-    getAllNewsList(item) {
-      const data = {
-        categoryId: item.id,
-        contypeId: item.contypeId,
-        p: this.currentPage
-      }
-      getNewsList(data)
-        .then((res) => {
-          console.log('res', res)
-          if (res.code == 200) {
-            this.newsList = res.data.records
-            this.total = Number(res.data.total)
-          }
-        })
-        .catch((err) => {
-          console.log('err', err)
-        })
+    // 璺宠浆鍒版柊闂诲睍绀洪〉闈�
+    show(item){
+      // console.log(item.id);
+      this.$router.push({path:'/home/news',query:{id:item.id}})
     }
   }
 }
@@ -138,4 +131,12 @@
 .ft-black {
   color: #000;
 }
+.box-card{
+  height: 600px;
+  position: relative;
+  .fenye{
+    position: absolute;
+    bottom: 2px;
+  }
+} 
 </style>
\ No newline at end of file
diff --git a/src/components/page/zhengce.vue b/src/components/page/zhengce.vue
index 02e7cb6..c7d547f 100644
--- a/src/components/page/zhengce.vue
+++ b/src/components/page/zhengce.vue
@@ -7,38 +7,30 @@
       <!-- 灏忔爣棰� -->
       <el-col :span="4" class="marr10">
         <ul>
-          <li
-            v-for="(item, index) in menuList"
-            :key="index"
-            class="liStylenone liPointer marb10"
-            @click="changeMenu(item)"
-          >
-            <b :class="cont == item.categoryName ? 'ft-blue' : 'ft-black'">{{
-              item.categoryName
-            }}</b>
+          <li v-for="(item, index) in menuList" :key="index" class="liStylenone liPointer marb10" @click="changeMenu(item)">
+            <b :class="cont == item.name ? 'ft-blue' : 'ft-black'">{{item.name}}</b>
           </li>
         </ul>
       </el-col>
       <el-card class="box-card">
         <el-col :span="18">
           <div>
-            <el-row
-              class="marb10"
-              :key="index"
-              v-for="(item, index) in newsList"
-            >
-              {{ item.title }}
+            <el-row class="marb10" :key="index" v-for="(item, index) in newsList">
+              <div class="flex-v flex-between marb5 cursor" @click="show(item)">
+                <div>{{ item.title }}</div>
+                <div>{{ item.releaseTime }}</div>
+              </div>
             </el-row>
           </div>
           <!-- 鍒嗛〉 -->
-          <div>
+          <div class="fenye">
             <el-pagination
+              background
               @current-change="handleCurrentChange"
               :current-page.sync="currentPage"
-              :page-size="20"
-              layout="total, pager, next"
-              :total="total"
-            >
+              :page-size="pageSize"
+              layout="prev, pager, next,total"
+              :total="total">
             </el-pagination>
           </div>
         </el-col>
@@ -59,62 +51,66 @@
     return {
       cont: '',
       menuList: [],
-      newsList: [],
-      total: 0,
-      currentPage: 1
+      newsList:[],
+      pageSize:2,
+      currentPage:1,
+      total:0,
+      item:{},
     }
   },
   created() {
-    this.getMinTitleList()
   },
-  mounted() {},
+  mounted() {
+    this.getTitle();
+  },
   watch: {
-    menuList(newval, oldval) {
-      this.getAllNewsList(this.menuList[0])
-      this.cont = this.menuList[0].categoryName
+    menuList(n,o){
+      this.cont =  this.menuList[0].name;
+      this.getnews(this.menuList[0]);
     }
   },
   methods: {
     handleCurrentChange(val) {
-      console.log(`褰撳墠椤�: ${val}`)
+      console.log(`褰撳墠椤�: ${val}`);
+      this.getnews(this.item);
+    },
+    getTitle(){
+      const data = Number(this.$route.query.id);
+      getMinTitle(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.menuList = res.data
+        }
+      }).catch(err => {
+        console.log(err);
+      })
     },
     changeMenu(val) {
-      this.getAllNewsList(val)
-      this.cont = val.categoryName
+      this.cont = val.name
+      this.item = val
+      this.currentPage = 1
+      this.getnews(val);
     },
-    getMinTitleList() {
+    getnews(item){
       const data = {
-        contypeId: this.$route.query.id,
-        p: 1
-      }
-      getMinTitle(data)
-        .then((res) => {
-          console.log('res', res)
-          if (res.code == 200) {
-            this.menuList = res.data.records
-          }
-        })
-        .catch((err) => {
-          console.log('err', err)
-        })
+        current:this.currentPage,
+        newsCategoryId:item.id,
+        size:this.pageSize
+      };
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.newsList = res.data.records
+          this.total =  Number(res.data.total)
+        }
+      }).catch(error => {
+        console.log(error);
+      })
     },
-    getAllNewsList(item) {
-      const data = {
-        categoryId: item.id,
-        contypeId: item.contypeId,
-        p: this.currentPage
-      }
-      getNewsList(data)
-        .then((res) => {
-          console.log('res', res)
-          if (res.code == 200) {
-            this.newsList = res.data.records
-            this.total = Number(res.data.total)
-          }
-        })
-        .catch((err) => {
-          console.log('err', err)
-        })
+    // 璺宠浆鍒版柊闂诲睍绀洪〉闈�
+    show(item){
+      // console.log(item.id);
+      this.$router.push({path:'/home/news',query:{id:item.id}})
     }
   }
 }
@@ -136,4 +132,12 @@
 .ft-black{
   color: #000;
 }
+.box-card{
+  height: 600px;
+  position: relative;
+  .fenye{
+    position: absolute;
+    bottom: 2px;
+  }
+} 
 </style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 6bc597e..97a6142 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,13 @@
 import './assets/css/global.css'
 import './assets/css/my_style.css'
 
+
+
 import axios from 'axios'
 // 閰嶇疆璇锋眰鐨勮窡璺緞
-axios.defaults.baseURL = 'http://8.140.68.52:8181'
+// axios.defaults.baseURL = 'http://8.140.68.52:8181'
+// axios.defaults.baseURL = 'http://127.0.0.1:8888/api/private/v1'
+axios.defaults.baseURL = 'http://localhost:8080/'
 axios.interceptors.request.use(config => {
   // console.log(config)
   config.headers.Authorization = window.sessionStorage.getItem('token')
diff --git a/src/router.js b/src/router.js
index c95cde3..82d7ea9 100644
--- a/src/router.js
+++ b/src/router.js
@@ -2,6 +2,7 @@
 import Router from 'vue-router'
 import Login from './components/Login.vue'
 import Home from './components/Home.vue'
+import NotFound from './components/NotFound.vue'
 import index from './components/page/index.vue'
 import introduce from './components/page/introduce.vue'
 import zhengce from './components/page/zhengce.vue'
@@ -11,10 +12,12 @@
 import kePuFengCai from './components/page/kePuFengCai.vue'
 import xueXiaoShouYe from './components/page/xueXiaoShouYe.vue'
 import telephone from './components/page/telephone.vue'
-import schoolMessage from './views/homePage/schoolMessage'
-import noticeMessage from './views/homePage/noticeMessage'
+import News from './components/page/News.vue'
 import moreMessage from './views/homePage/moreMessage'
-import workMessage from './views/homePage/workMessage'
+import Administrator from './components/Administrator/AdminHome.vue'
+import Welcome from './components/Administrator/Welcome.vue'
+import Main from './components/Administrator/Main.vue'
+import Edit from './components/Administrator/Edit.vue'
 
 
 Vue.use(Router)
@@ -23,6 +26,13 @@
   routes: [
     { path: '/', redirect: '/home' },
     { path: '/login', component: Login },
+    { path:'/administrator',
+      component: Administrator,
+      children: [{ path:'welcome',component:Welcome },
+                { path:'main',component:Main },
+                { path:'edit',component:Edit },
+                { path:'news',component:News }] 
+    },
     { 
       path: '/home', 
       component: Home ,
@@ -76,27 +86,18 @@
           component:telephone
         },
         {
-          path:'schoolMessage',
-          name:'schoolMessage',
-          component:schoolMessage
-        },
-        {
-          path:'noticeMessage',
-          name:'noticeMessage',
-          component:noticeMessage
-        },
-        {
           path:'moreMessage',
           name:'moreMessage',
           component:moreMessage
         },
         {
-          path:'workMessage',
-          name:'workMessage',
-          component:workMessage
+          path:'news',
+          name:'News',
+          component:News
         },
       ]
-    }
+    },
+    { path:'*',component:NotFound }
   ],
   scrollBehavior(to, from, savedPosition) { //椤甸潰璺宠浆鍚庤嚜鍔ㄥ洖鍒伴《閮�
     if (savedPosition) {
diff --git a/src/utils/request.js b/src/utils/request.js
index 254bdeb..dbffe70 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,6 +1,6 @@
 //瀵筧xios鐨勫皝瑁�
 import axios from 'axios'
-let is_baseURL = 'http://8.140.68.52:8181/'//娴嬭瘯鐜
+let is_baseURL = 'http://localhost:8080/'//娴嬭瘯鐜
 //鍒涘缓axios瀹炰緥
 const request = axios.create({
   baseURL: is_baseURL
diff --git a/src/views/homePage/moreMessage.vue b/src/views/homePage/moreMessage.vue
index d0673e5..88b6789 100644
--- a/src/views/homePage/moreMessage.vue
+++ b/src/views/homePage/moreMessage.vue
@@ -5,100 +5,185 @@
     </el-row>
     <div class="mart15">
       <div v-if="this.$route.query.type == '閫氱煡鍏憡'">
-        <ul>
-          <li class="lieBiao flex-v flex-between" :key="index" v-for="(item, index) in noticeList">
-            <div class="time">
-              <span>{{ item.year }}</span>
-              <span>{{ item.month }}</span>
-            </div>
-            <div class="title liPointer" @click="toNoticeMsg(item.id,item.count)">
-              {{ item.news }}
-            </div>
-          </li>
-        </ul>
+        <el-card>
+          <ul class="ul">
+            <li class="lieBiao liPointer flex-v flex-between" :key="index" v-for="(item, index) in noticeList">
+              <div class="time">
+                {{ item.releaseTime }}
+              </div>
+              <div class="title" @click="toNoticeMsg(item.id)">
+                {{ item.title }}
+              </div>
+            </li>
+          </ul>
+          <!-- 鍒嗛〉 -->
+          <div class="fenye">
+            <el-pagination
+              background
+              @current-change="handleCurrentChange"
+              :current-page.sync="currentPage"
+              :page-size="pageSize"
+              layout="prev, pager, next,total"
+              :total="total">
+            </el-pagination>
+          </div>
+        </el-card>
       </div>
       <div v-if="this.$route.query.type == '瀛﹂櫌鍔ㄦ��'">
         <ul>
-          <li class="lieBiao flex-v flex-between" :key="index" v-for="(item, index) in schoolList">
-            <!-- <a href="item.path"> {{ item.title }} </a> -->
-            <!-- <router-link :to="{name:'schoolMessage',params:{id:item.id}}" >{{ item.title }} </router-link> -->
-            <div class="time">
-              <span>{{ item.year }}</span>
-              <span>{{ item.month }}</span>
+          <el-card>
+            <ul class="ul">
+              <li class="lieBiao liPointer flex-v flex-between" :key="index" v-for="(item, index) in schoolList">
+                <div class="time">
+                  {{ item.releaseTime }}
+                </div>
+                <div class="title" @click="toSchoolMsg(item.id)">
+                  {{ item.title }}
+                </div>
+              </li>
+            </ul>
+            <!-- 鍒嗛〉 -->
+            <div class="fenye">
+              <el-pagination
+                background
+                @current-change="handleCurrentChange"
+                :current-page.sync="currentPage"
+                :page-size="pageSize"
+                layout="prev, pager, next,total"
+                :total="total">
+              </el-pagination>
             </div>
-            <div  class="title liPointer" @click="toSchoolMsg(item.id,item.count)">
-              {{ item.news }}
-            </div>
-          </li>
+        </el-card>
         </ul>
       </div>
       <div v-if="this.$route.query.type == '宸ヤ綔鐘舵��'">
-        <ul>
-          <li class="lieBiao flex-v flex-between" :key="index" v-for="(item, index) in workList">
-            <!-- <a href="item.path"> {{ item.title }} </a> -->
-            <!-- <router-link :to="{name:'schoolMessage',params:{id:item.id}}" >{{ item.title }} </router-link> -->
-            <div class="time">
-              <span>{{ item.year }}</span>
-              <span>{{ item.month }}</span>
+         <ul>
+           <el-card>
+            <ul class="ul">
+              <li class="lieBiao liPointer flex-v flex-between" :key="index" v-for="(item, index) in workList">
+                <div class="time">
+                  {{ item.releaseTime }}
+                </div>
+                <div class="title" @click="toWorkMsg(item.id)">
+                  {{ item.title }}
+                </div>
+              </li>
+            </ul>
+            <!-- 鍒嗛〉 -->
+            <div class="fenye">
+              <el-pagination
+                background
+                @current-change="handleCurrentChange"
+                :current-page.sync="currentPage"
+                :page-size="pageSize"
+                layout="prev, pager, next,total"
+                :total="total">
+              </el-pagination>
             </div>
-            <div class="title liPointer" @click="toWorkMsg(item.id,item.count)">{{ item.news }}</div>
-          </li>
+           </el-card>
         </ul>
       </div>
     </div>
   </div>
 </template>
 <script>
+import {getNewsList} from '../../api/api'
 export default {
   name: 'moreMessage',
   data() {
     return {
-      noticeList: [{id:1,year: 2022,month:'1-10',count:10, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:2,year: 2022,month:'1-10',count:11, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:3,year: 2022,month:'1-10',count:12, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:4,year: 2022,month:'1-10',count:13, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:5,year: 2022,month:'1-10',count:14, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:14, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:6,year: 2022,month:'1-10',count:15, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:16, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:6,year: 2022,month:'1-10',count:16, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:17, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'}],
-      
-      schoolList: [{id:1,year: 2022,month:'1-10',count:10, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},{id:2,year: 2022,month:'1-10',count:11, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},
-      {id:3,year: 2022,month:'1-10',count:12, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},{id:4,year: 2022,month:'1-10',count:13, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},
-      {id:5,year: 2022,month:'1-10',count:14, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},{id:6,year: 2022,month:'1-10',count:14, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},
-      {id:6,year: 2022,month:'1-10',count:15, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},{id:6,year: 2022,month:'1-10',count:16, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},
-      {id:6,year: 2022,month:'1-10',count:16, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'},{id:6,year: 2022,month:'1-10',count:17, news:'鍞愪笁钘忓弬瑙佸コ鐜嬮櫅涓�'}],
-
-      workList: [{id:1,year: 2022,month:'1-10',count:10, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},{id:2,year: 2022,month:'1-10',count:11, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},
-      {id:3,year: 2022,month:'1-10',count:12, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},{id:4,year: 2022,month:'1-10',count:13, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},
-      {id:5,year: 2022,month:'1-10',count:14, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},{id:6,year: 2022,month:'1-10',count:14, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},
-      {id:6,year: 2022,month:'1-10',count:15, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},{id:6,year: 2022,month:'1-10',count:16, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},
-      {id:6,year: 2022,month:'1-10',count:16, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'},{id:6,year: 2022,month:'1-10',count:17, news:'榛戜汉瓒呯櫧绔圭偔娣辨磥鐗欒啅'}],
+      noticeList: [],
+      schoolList: [],
+      workList: [],
+      currentPage:1,
+      pageSize:4,
+      total:0,
     }
   },
+  mounted(){
+    this.getnotice();
+    this.getwork();
+    this.getschool();
+  },
   methods: {
-    toNoticeMsg(id,count) {
+    handleCurrentChange(val){
+      console.log(`褰撳墠椤�: ${val}`);
+      this.getnotice();
+      this.getwork();
+      this.getschool();
+    },
+    //鑾峰彇鏂伴椈鍒楄〃
+    getnotice(){
+      const data = {
+        current:this.currentPage,
+        newsCategoryId:42,
+        size:this.pageSize
+      }
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.noticeList = res.data.records
+          this.total =  Number(res.data.total)
+        }
+      }).catch(error => {
+        console.log(error);
+      })
+    },
+    getwork(){
+      const data = {
+        current:this.currentPage,
+        newsCategoryId:43,
+        size:this.pageSize
+      }
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.workList = res.data.records
+          this.total =  Number(res.data.total)
+        }
+      }).catch(error => {
+        console.log(error);
+      })
+    },
+    getschool(){
+      const data = {
+        current:this.currentPage,
+        newsCategoryId:44,
+        size:this.pageSize
+      }
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.schoolList = res.data.records
+          this.total =  Number(res.data.total)
+        }
+      }).catch(error => {
+        console.log(error);
+      })
+    },
+    toNoticeMsg(id) {
       this.$router.push({
-        path: '/home/noticeMessage',
+        path: '/home/news',
         query: {
           id: id,
-          count: count
         }
       })
       window.location.reload()
     },
-    toSchoolMsg(id,count) {
+    toSchoolMsg(id) {
       this.$router.push({
-        path: '/home/schoolMessage',
+        path: '/home/news',
         query: {
           id: id,
-          count: count
         }
       })
       window.location.reload()
     },
-    toWorkMsg(id,count) {
+    toWorkMsg(id) {
       this.$router.push({
-        path: '/home/workMessage',
+        path: '/home/news',
         query: {
           id: id,
-          count: count
         }
       })
       window.location.reload()
@@ -117,17 +202,24 @@
   margin-bottom: 10px;
 }
 .time {
-  width: 80px;
+  width: 100px;
+  padding: 17px 0px;
   display: flex;
   flex-direction: column;
-  padding: 8px;
   background-color: rgb(1, 72, 153);
   color: white;
   text-align: center;
 }
 .title {
-  width: 1030px;
-  height: 70px;
+  width: 550px;
+  height: 50px;
   overflow: hidden;
+  line-height: 60px;
+  /* // background-color: rgb(179, 19, 19); */
+  padding: 0 0 0 10px;
+}
+.ul{
+  width: 700px;
+  margin: 0 auto;
 }
 </style> 
\ No newline at end of file
diff --git a/src/views/homePage/noticeMessage.vue b/src/views/homePage/noticeMessage.vue
deleted file mode 100644
index 3e126cb..0000000
--- a/src/views/homePage/noticeMessage.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div>
-    <p>{{ this.$route.query.id }} 鐐瑰嚮閲忥細銆恵{this.$route.query.count}}銆�</p>
-    <div v-html="message"></div>
-  </div>
-</template>
-<script>
-export default {
-  name:'noticeMessage',
-  data(){
-    return {
-      message:''
-    }
-  },
-  created(){
-    console.log(">>>>>>>>",this.$route.query.id);
-    this.queryAll();
-  },
-  methods:{
-    queryAll(){
-      this.message = `<div id="vsb_content_7" class="content-con"><div class="v_news_content">
-<p class="vsbcontent_start">鏍″睘鍚勫崟浣嶏細</p>
-<p>涓哄仛濂藉浗瀹惰嚜绉戝熀閲戦」鐩殑鐢虫姤宸ヤ綔锛屽疄鐜板浗瀹惰嚜绉戝熀閲戦」鐩敵鎶ユ暟閲忋�佽川閲忓強绔嬮」鐜囩殑绐佺牬鍜屾彁鍗囷紝鐜板惎鍔ㄦ垜鏍�2022骞村害鍥藉鑷鍩洪噾椤圭洰涓夌骇璁鸿瘉宸ヤ綔锛岀幇灏嗘湁鍏充簨椤瑰畨鎺掑涓嬶細</p>
-<p><strong>涓�銆佺敵鎶ュ伐浣滈噸鐐�</strong></p>
-<p>1.骞撮緞鍦�35宀佷互涓嬶紙鐢凤級鍜�40宀佷互涓嬶紙濂筹級鍏锋湁鍗氬+瀛︿綅鏁欏笀灏氭湭鑾峰緱鍥藉绾ч」鐩殑鍘熷垯涓婂繀椤荤敵鎶ラ潚骞村熀閲戦」鐩紱鍏朵粬灏氭湭鑾锋壒鍥藉绾ч」鐩殑鍗氬+銆佸壇鏁欐巿銆佹暀鎺堝師鍒欎笂鍙兘鐢虫姤闈笂鍩洪噾椤圭洰鎴栬仈鍚堝熀閲戦」鐩��</p>
-<p>2.榧撳姳绗﹀悎鏉′欢鐨勫叾浠栨暀甯堢Н鏋佺敵鎶ヤ笂杩伴」鐩��</p>
-<p>3.鍑℃槸閫氳繃鍥藉鍩洪噾濮斿舰寮忓鏌ョ殑椤圭洰鐢虫姤涔︼紝瀵归」鐩敵鎶ヤ汉浜堜互鐩稿簲鐨勭鐮旂Н鍒嗚瀹氥��</p>
-<p><strong>浜�</strong><strong>銆侀」鐩敵鎶ヤ功鎾板啓</strong></p>
-<p>2021骞�11鏈�25鏃ヤ笅鍗�4鐐瑰墠锛屽悇鍗曚綅鐢虫姤鏁欏笀鍙傜収銆�2021骞村害鍥藉鑷劧绉戝鍩洪噾椤圭洰璇鹃鎸囧崡銆嬪強椤圭洰鐢虫姤瑕佹眰锛岀‘瀹氶�夐锛岀粡杩囪棰樼粍闆嗕腑璁ㄨ锛屾挵鍐欑敵璇蜂功鍒濈銆傝姹傚悇瀛﹂櫌浜�11鏈�25鏃ュ墠灏嗘湰鍗曚綅棰勭敵鎶ョ殑鐢宠涔﹀垵绋垮拰姹囨�昏〃锛屼互鈥滃闄�+2022鍥借嚜绉戝熀閲戦」鐩潗鏂欌�濆懡鍚嶏紝鎵撳寘鍙戣嚦绉戠爺澶勯偖绠眕dsukyc02@126.com锛屽悓鏃剁焊璐ㄧ増1浠戒氦鑷崇鐮斿銆�</p>
-<p><strong>涓�</strong><strong>銆佷笁绾ц璇�</strong></p>
-<p>1. 椤圭洰缁勫唴閮ㄨ璇侊紙2021骞�11鏈�17鏃モ��2021骞�12鏈�10鏃ワ級</p>
-<p>鍚勯」鐩粍缁勭粐鐩稿叧浜哄憳锛屽鎵�鐢虫姤鍩洪噾璇鹃鍒濈杩涜鍐呴儴璁鸿瘉銆傚悇椤圭洰璐熻矗浜烘牴鎹」鐩粍璁鸿瘉鎰忚璁ょ湡淇敼瀹屽杽鐢宠涔︼紝褰㈡垚銆婄敵璇蜂功銆嬪垵绋垮苟鎻愪氦銆婁簩绾у闄㈣璇佹儏鍐佃〃銆�1浠姐��</p>
-<p>2. 浜岀骇瀛﹂櫌璁鸿瘉锛�2021骞�12鏈�11鏃モ��2022骞�1鏈�1鏃ワ級</p>
-<p>鍚勪簩绾у闄㈤個璇蜂笉浣庝簬5鍚嶇浉鍏冲绉戦鍩熺殑鏍″鐭ュ悕鍩洪噾涓撳杩涜璁鸿瘉锛岀敵璇蜂汉鍚戜笓瀹惰繘琛孭PT姹囨姤锛屾牴鎹笓瀹舵彁鍑虹殑鎰忚锛岃鐪熶慨鏀瑰畬鍠勶紝褰㈡垚銆婄敵璇蜂功銆嬩簩绋裤�傚悇浜岀骇瀛﹂櫌浜�2022骞�1鏈�1鏃ュ墠鍚戠鐮斿鎶ラ�佺焊璐ㄧ増銆�2022骞村害鍥藉鑷鍩洪噾椤圭洰鐢虫姤姹囨�昏〃銆嬶紙<strong>鏍规嵁涓撳鎰忚鎺掑簭</strong>锛夊強銆婁簩绾у闄㈣璇佹儏鍐佃〃銆嬪悇1浠斤紙鍗曚綅鐩栫珷锛岃礋璐d汉绛惧瓧锛夈��</p>
-<p>3. 瀛︽牎璁鸿瘉锛�2022骞�1鏈�2鏃モ��2022骞�1鏈�15鏃ワ級</p>
-<p>鍚勪簩绾у闄簬2022骞�1鏈�2鏃ュ墠锛屽悜绉戠爺澶勬姤閫�<strong>绾歌川鐗堛�婄敵璇蜂功銆�</strong><strong>5</strong><strong>浠�</strong><strong>锛岀數瀛愮増鍙戦�佽嚦</strong>閭<strong>pdsukyc0</strong><strong>2</strong><strong>@126.com</strong>銆傜鐮斿閭�璇锋牎澶栫浉鍏充笓瀹讹紝瀵圭敵璇蜂功杩涜璁鸿瘉銆傜敵璇蜂汉鏍规嵁鏍″涓撳璇勫璁鸿瘉鎰忚锛屽厖鍒嗗埄鐢ㄥ瘨鍋囨椂闂磋鐪熶慨鏀瑰畬鍠勭敵璇蜂功锛屽舰鎴愩�婄敵璇蜂功銆嬩笁绋裤��</p>
-<p><strong>鍥�</strong><strong>銆佸舰寮忓鏌ュ強瀹氱鏉愭枡鎶ラ��</strong></p>
-<p>1.2022骞村厓鏈堜腑鏃紝鑷劧绉戝鍩洪噾濮斿彂甯�2022骞存渶鏂扮敵鎶ユ寚鍗楀悗锛岀敵璇蜂汉璁ょ湡鐮旇銆�2022骞村害鍥藉鑷劧绉戝鍩洪噾椤圭洰鎸囧崡銆嬶紝璇︾粏浜嗚В2022骞村浗瀹惰嚜鐒剁瀛﹀熀閲戦」鐩敵鎶ヨ姹傘�佹斂绛栧彉鍖栧強鐩稿叧娉ㄦ剰浜嬮」锛屽苟鐧诲綍鍥藉鑷劧绉戝鍩洪噾缃戠粶淇℃伅绯荤粺锛屾寜鐓у悇绫诲瀷椤圭洰鐨勬挵鍐欐彁绾插強鐩稿叧瑕佹眰鎾板啓鐢宠涔︺��</p>
-<p>2. 椤圭洰鐢宠浜哄姟蹇呭鐓с��2022骞村熀閲戦」鐩敵璇蜂功濉啓娉ㄦ剰浜嬮」銆嬶紝瀵圭敵璇蜂功杩涜閫愰」瀹℃煡锛屽~鍐欍��2022骞村浗瀹惰嚜鐒剁瀛﹀熀閲戦」鐩敵璇蜂功褰㈠紡瀹℃煡琛ㄣ�嬶紝瀹屾垚褰㈠紡涓�瀹°��</p>
-<p>3. 鐢宠浜哄畬鎴愮敵璇蜂功鎾板啓鍚庯紝鍦ㄧ嚎鎻愪氦鐢靛瓙鐢宠涔﹀強闄勪欢鏉愭枡銆傜敵璇锋潗鏂欎腑鎵�闇�鐨勯檮浠舵潗鏂欙紝鍏ㄩ儴浠ョ數瀛愭壂鎻忎欢涓婁紶銆�</p>
-<p>4. 鍚勫崟浣嶄富绠¤礋璐d汉銆佹暀绉戝姙缁勭粐鍔涢噺锛屾牴鎹�婃寚鍗椼�嬪強褰㈠紡瀹℃煡瑕佹眰锛屽鏈崟浣嶆墍鏈夊浗鍩洪噾鐢宠涔︾粺涓�杩涜褰㈠紡浜屽锛屽苟濉啓銆婂闄㈠鏍告壙璇轰功銆嬪拰鐢虫姤椤圭洰姹囨�昏〃锛岀敵璇蜂汉鐨勩�婂舰寮忓鏌ヨ〃銆嬬暀鍚勫崟浣嶅鏌ャ�傚悇瀛﹂櫌瀹℃牳鎵胯涔︺�佹眹鎬昏〃涓婂潎闇�鍗曚綅涓荤璐熻矗浜虹瀛楀苟鍔犵洊鍗曚綅鍏珷銆�</p>
-<p>5. 2022骞�3鏈�6鏃�-8鏃ュ悇浜岀骇瀛﹂櫌灏嗗浗瀹惰嚜绉戝熀閲戦」鐩敵璇蜂功1浠斤紝涓荤闄㈤暱绛惧瓧骞剁洊绔犵殑椤圭洰瀹℃牳鎵胯涔﹀拰椤圭洰鐢虫姤姹囨�昏〃1浠芥姤閫佺鐮斿锛岀鐮斿灏嗙粺涓�杩涜褰㈠紡涓夊銆傜數瀛愮増涓汉銆婂舰寮忓鏌ヨ〃銆嬩互瀛﹂櫌涓哄崟浣嶇粺涓�鍙戦�侀偖绠便��</p>
-<p><strong>浜斻�佺浉鍏宠姹�</strong></p>
-<p>1.鍚勪簩绾у闄㈣楂樺害閲嶈銆傜Н鏋佺粍缁囨湰鍗曚綅鏁欏笀瀛︿範銆婂浗瀹惰嚜鐒剁瀛﹀熀閲戦」鐩寚鍗椼�嬶紝涓ユ牸鎸夌収鏈夊叧鐢宠浜虹殑鏉′欢瑕佹眰鍙婇檺椤硅姹傦紝璁ょ湡缁勭粐鎾板啓鐢宠涔︼紝閭�璇锋牎鍐呭涓撳鍏呭垎璁鸿瘉銆�</p>
-<p>娌℃湁鐢虫姤甯愬彿鐨勬暀鑱屽伐锛岃鍙婃椂鑱旂郴绉戠爺澶勫紑閫氬笎鍙枫��</p>
-<p>2.鍧氬喅鏉滅粷鍚勭绉戠爺涓嶇琛屼负銆傚悇椤圭洰鐢虫姤浜哄鎵�鎻愪氦鐢宠鏉愭枡鐨勫師鍒涙�ц礋璐o紱涓嶅緱灏嗗唴瀹圭浉鍚屾垨鐩歌繎鐨勯」鐩紝浠ヤ笉鍚岀被鍨嬮」鐩悜鍚屼竴绉戝閮ㄦ垨涓嶅悓绉戝閮ㄧ敵璇凤紱涓嶅緱灏嗗唴瀹圭浉鍚屾垨鐩歌繎鐨勯」鐩紝閫氳繃涓嶅悓渚濇墭鍗曚綅鎴栦互涓嶅悓鐢宠浜虹殑鍚嶄箟鎻愬嚭鐢宠锛涗笉寰楀皢宸茶幏璧勫姪椤圭洰閲嶆柊鐢宠璧勫姪銆�</p>
-<p>鑱旂郴 浜猴細鏉ㄩ敠浼� 鑱旂郴鐢佃瘽锛�2657757</p>
-<p>鎶ラ�佸湴鐐癸細鍔炲叕妤�330鎴块棿</p>
-<p style="text-align: right;">绉戠爺澶勶紙鐮旂┒鐢熷伐浣滃锛�</p>
-<p class="vsbcontent_end">2021骞�11鏈�16鏃�</p>
-</div></div>`
-    }
-  }
-}
-</script>
-<style>
-
-</style>
\ No newline at end of file
diff --git a/src/views/homePage/schoolMessage.vue b/src/views/homePage/schoolMessage.vue
deleted file mode 100644
index 569f86a..0000000
--- a/src/views/homePage/schoolMessage.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <div>
-    <span>schoolMessage</span>
-    <p>{{ this.$route.query.title }}</p>
-  </div>
-</template> 
-<script>
-export default {
-  name:'schoolMessage',
-  data(){
-    return {
-
-    }
-  },
-  created(){
-    console.log(">>>>>>>>",this.$route.params.id);
-  }
-}
-</script>
-<style>
-
-</style>
\ No newline at end of file
diff --git a/src/views/homePage/workMessage.vue b/src/views/homePage/workMessage.vue
deleted file mode 100644
index 9f62eba..0000000
--- a/src/views/homePage/workMessage.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <div>
-    <span>woekMessage</span>
-    <p>{{ this.$route.query.title }}</p>
-  </div>
-</template>
-
-<script>
-export default {
-  name : 'workMessage',
-  data() {
-    return{
-
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/src/views/notice.vue b/src/views/notice.vue
index 2c73869..907d956 100644
--- a/src/views/notice.vue
+++ b/src/views/notice.vue
@@ -12,11 +12,10 @@
       <ul>
         <li class="lieBiao liPointer" :key="index" v-for="(item, index) in noticeList">
           <div class="time">
-            <span>{{ item.year }}</span>
-            <span>{{ item.month }}</span>
+            {{ item.releaseTime }}
           </div>
-          <div class="title" @click="toNoticeMsg(item.id,item.count)">
-            {{ item.news }}
+          <div class="title" @click="toNoticeMsg(item.id)">
+            {{ item.title }}
           </div>
         </li>
       </ul>
@@ -24,45 +23,52 @@
   </div>
 </template>
 <script>
-import {getNewsList} from '../api/api'
+import axios from 'axios'
+import {getMinTitle,getNewsList} from '../api/api'
 export default {
   name: 'notice',
   data() {
     return {
-     noticeList: [{id:1,year: 2022,month:'1-10',count:10, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:2,year: 2022,month:'1-10',count:11, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:3,year: 2022,month:'1-10',count:12, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:4,year: 2022,month:'1-10',count:13, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:5,year: 2022,month:'1-10',count:14, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:14, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:6,year: 2022,month:'1-10',count:15, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:16, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:6,year: 2022,month:'1-10',count:16, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:17, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'}],
+     noticeList: [],
     }
   },
   created() {
-    this.getnews();
+  },
+  mounted(){
+    //鑾峰彇灏忔爣棰�
+    // axios.get('http://localhost:8080/news_category/list/1').then(res => {
+    //   console.log(res);
+    //   if(res.status==200){
+    //     this.noticeList = res.data.data
+    //   }
+    // }).catch(err => {
+    //   console.log(err);
+    // })
+    this.getnews()
   },
   methods: {
     //鑾峰彇鏂伴椈鍒楄〃
-    getnews() {
+    getnews(){
       const data = {
-        categoryId: 1,//灏忔爣棰業D
-        contypeId: 2,//澶ф爣棰業D
-        p: 0//褰撳墠椤�
-      };
+        current:1,
+        newsCategoryId:42,
+        size:6
+      }
       getNewsList(data).then(res => {
-        console.log('res',res);
+        console.log(res);
         if(res.code == 200){
           this.noticeList = res.data.records
         }
-      }).catch(err => {
-        console.log('err',err);
+      }).catch(error => {
+        console.log(error);
       })
     },
     // 鍘诲埌鏂伴椈灞曠ず椤�
-    toNoticeMsg(id,count) {
+    toNoticeMsg(id) {
       this.$router.push({
-        path: '/home/noticeMessage',
+        path: '/home/news',
         query: {
           id:id,
-          count:count
         }
       })
     },
@@ -83,7 +89,7 @@
   border-bottom: 1px solid rgb(1, 72, 153);
 }
 .lieBiao {
-  width: 95%;
+  width: 100%;
   height: 55px;
   background: rgb(241, 241, 241);
   display: flex;
@@ -92,12 +98,10 @@
   margin-bottom: 10px;
 }
 .time {
-  width: 80px;
-  overflow: hidden;
+  width: 100px;
+  padding: 17px 0px;
   display: flex;
-  // line-height: 20px;
   flex-direction: column;
-  padding: 8px;
   background-color: rgb(1, 72, 153);
   color: white;
   text-align: center;
@@ -107,6 +111,7 @@
   height: 50px;
   overflow: hidden;
   line-height: 50px;
+  // background-color: rgb(179, 19, 19);
   padding: 0 0 0 10px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/school.vue b/src/views/school.vue
index 8515aee..58963fb 100644
--- a/src/views/school.vue
+++ b/src/views/school.vue
@@ -9,10 +9,8 @@
     <div style="max-height:420px;overflow:hidden;">
       <ul>
         <li :key="index" v-for="(item, index) in schoolList" class="liPointer">
-          <!-- <a href="item.path"> {{ item.title }} </a> -->
-          <!-- <router-link :to="{name:'schoolMessage',params:{id:item.id}}" >{{ item.title }} </router-link> -->
-          <div @click="toSchoolMsg(item.title)" class="bgc mart10">
-            {{ item.news }}
+          <div @click="toSchoolMsg(item.id)" class="bgc mart10">
+            {{ item.title }}
           </div>
         </li>
       </ul>
@@ -25,11 +23,7 @@
   name: 'school',
   data() {
     return {
-      schoolList: [{id:1,year: 2022,month:'1-10',count:10, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:2,year: 2022,month:'1-10',count:11, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:3,year: 2022,month:'1-10',count:12, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:4,year: 2022,month:'1-10',count:13, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:5,year: 2022,month:'1-10',count:14, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:14, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:6,year: 2022,month:'1-10',count:15, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:16, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:6,year: 2022,month:'1-10',count:16, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:17, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'}],
+      schoolList: [],
     }
   },
   created() {
@@ -38,17 +32,17 @@
   methods:{
     getnews(){
       const data = {
-        categoryId: 1,
-        contypeId: 2,
-        p: 0
-    }
+        current:1,
+        newsCategoryId:44,
+        size:6
+      }
       getNewsList(data).then(res => {
-        console.log('res',res);
+        console.log(res);
         if(res.code == 200){
           this.schoolList = res.data.records
         }
-      }).catch(err => {
-        console.log('err',err);
+      }).catch(error => {
+        console.log(error);
       })
     },
     //鍓嶅線鏇村淇℃伅椤甸潰
@@ -61,11 +55,11 @@
       })
     },
     //鍓嶅線淇℃伅灞曠ず椤甸潰
-    toSchoolMsg(t) {
+    toSchoolMsg(id) {
       this.$router.push({
-        path: 'schoolMessage',
+        path: '/home/news',
         query: {
-          title:t
+          id:id
         }
       })
     }
diff --git a/src/views/work.vue b/src/views/work.vue
index 2b54ea9..85140a4 100644
--- a/src/views/work.vue
+++ b/src/views/work.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-row type="flex" justify="space-between" class="underline">
+    <el-row type="flex" justify="space-between" class="underline row-bg">
       <span class="color"><b>宸ヤ綔鍔ㄦ��</b></span>
       <span @click="goMore('宸ヤ綔鐘舵��')" class="liPointer"
         >鏇村<i class="el-icon-d-arrow-right"></i>
@@ -9,8 +9,8 @@
     <div style="max-height:420px;overflow:hidden;">
       <ul>
         <li :key="index" v-for="(item, index) in workList" class="liPointer">
-          <div @click="toWorkMsg(item.title)" class="bgc mart10">
-            {{ item.news }}
+          <div @click="toWorkMsg(item.id)" class="bgc mart10">
+            {{ item.title }}
           </div>
         </li>
       </ul>
@@ -23,38 +23,34 @@
   name:'work',
   data(){
     return{
-      workList: [{id:1,year: 2022,month:'1-10',count:10, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:2,year: 2022,month:'1-10',count:11, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:3,year: 2022,month:'1-10',count:12, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:4,year: 2022,month:'1-10',count:13, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:5,year: 2022,month:'1-10',count:14, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:14, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:6,year: 2022,month:'1-10',count:15, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:16, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},
-      {id:6,year: 2022,month:'1-10',count:16, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'},{id:6,year: 2022,month:'1-10',count:17, news:'浣犺蛋杩囩殑鍦版柟鍙墿涓嬫�濆康闅炬嵄锛屾妸浣犺棌鍦ㄥ績澶达紝姣忓ぉ姣忓鎯充綘'}],
+      workList: [],
     }
   },
   created() {
-    // this.getnews();
+    this.getnews()
   },
   methods:{
     //鑾峰彇鏂伴椈鍒楄〃
-    // getnews() {
-    //   const data = {
-    //     categoryId: 2,//灏忔爣棰業D
-    //     contypeId: 2,//澶ф爣棰業D
-    //     p: 0//褰撳墠椤�
-    //   };
-    //   getNewsList(data).then(res => {
-    //     console.log('res',res);
-    //     if(res.code == 200){
-    //       this.workList = res.data.records
-    //     }
-    //   }).catch(err => {
-    //     console.log('err',err);
-    //   })
-    // },
-    toWorkMsg(t) {
+    getnews(){
+      const data = {
+        current:1,
+        newsCategoryId:43,
+        size:6
+      }
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.workList = res.data.records
+        }
+      }).catch(error => {
+        console.log(error);
+      })
+    },
+    toWorkMsg(id) {
       this.$router.push({
-        path:'/home/workMessage',
+        path:'/home/news',
         query: {
-          title:t
+          id:id,
         }
       })
     },

--
Gitblit v1.8.0