From 546c0df2c7d278cb2a3e6fa6fc2ff730d410fdbd Mon Sep 17 00:00:00 2001
From: 明梦爽 <2972214568@qq.com>
Date: 星期二, 25 一月 2022 16:54:48 +0800
Subject: [PATCH] more

---
 src/components/Administrator/Main.vue      |   86 +++-
 src/components/Administrator/Main copy.vue |  424 ++++++++++++++++++++++++++++
 src/components/page/introduce.vue          |    4 
 src/components/Administrator/Edit copy.vue |   79 +++++
 src/components/page/xueShuJiaoLiu.vue      |   12 
 src/router.js                              |    4 
 src/components/Administrator/AdminHome.vue |    6 
 src/components/Administrator/EditLunBo.vue |   88 +++++
 src/components/page/News.vue               |   13 
 src/components/page/index.vue              |   40 ++
 src/assets/css/my_style.css                |   19 +
 src/components/page/kePuFengCai.vue        |   12 
 src/components/Administrator/Edit.vue      |   47 ++
 src/components/page/zhengce.vue            |   25 +
 14 files changed, 790 insertions(+), 69 deletions(-)

diff --git a/src/assets/css/my_style.css b/src/assets/css/my_style.css
index cd6c2ed..0189088 100644
--- a/src/assets/css/my_style.css
+++ b/src/assets/css/my_style.css
@@ -68,4 +68,23 @@
 /* 鍙樺皬鎵� */
 .cursor{
   cursor: pointer;
+}
+.hr{
+  margin: 2px 0;
+  height: 1px;
+  border: none;
+  border-top: 1px;
+}
+.name {
+  font-family: STHeiti;
+  font-size: 30px;
+  margin-top: 0px;
+  margin-bottom: 20px;
+  text-align: center;
+}
+.namehr{
+  /* border: 3px solid blue; */
+  height: 2px;
+  background-color: rgb(10, 10, 175);
+  margin-bottom: 20px;
 }
\ No newline at end of file
diff --git a/src/components/Administrator/AdminHome.vue b/src/components/Administrator/AdminHome.vue
index 72b3ec7..ea889e0 100644
--- a/src/components/Administrator/AdminHome.vue
+++ b/src/components/Administrator/AdminHome.vue
@@ -55,9 +55,9 @@
     }
   }
 }
-.el-main {
-  background-color: rgb(233, 237, 240);
-}
+// .el-main {
+//   // background-color: rgb(233, 237, 240);
+// }
 
 .iconfont {
   margin-right: 10px;
diff --git a/src/components/Administrator/Edit copy.vue b/src/components/Administrator/Edit copy.vue
new file mode 100644
index 0000000..385da2b
--- /dev/null
+++ b/src/components/Administrator/Edit copy.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="box">
+    <el-row>{{ $route.query.title }}</el-row>
+    鏂伴椈鏍囬锛�<el-input v-model="title" placeholder="璇疯緭鍏ユ柊闂绘爣棰�"></el-input><br/><br/>
+    鍙戝竷鏃ユ湡锛�<el-date-picker  format="yyyy 骞� MM 鏈� dd 鏃�" value-format="yyyy-MM-dd" v-model="releaseTime" placeholder="璇烽�夋嫨鏂伴椈鍙戝竷鏃ユ湡"></el-date-picker><br/><br/>
+    鏂伴椈鍐呭锛�<quill-editor ref="text" v-model="content" class="myQuillEditor" :options="editorOption" />
+    <el-row style="margin-top:50px;">
+      <el-button  type="success" @click="submit">鍙戝竷</el-button>
+    </el-row>
+  </div>
+</template>
+<script>
+import { add } from '../../api/api'
+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 {
+      title:'', //鏍囬鍐呭
+      releaseTime:'', //鍙戝竷鏃ユ湡
+      content: '',  //鏂伴椈鍐呭
+      newsCategoryId:2,
+      editorOption: {
+        placeholder: "璇疯緭鍏ユ鏂�",
+        // editorOption閲屾槸鏀惧浘鐗囦笂浼犻厤缃弬鏁扮敤鐨勶紝渚嬪锛�
+        action:  '/api/product/richtext_img_upload.do',  // 蹇呭~鍙傛暟 鍥剧墖涓婁紶鍦板潃
+        methods: 'POST',  // 蹇呭~鍙傛暟 鍥剧墖涓婁紶鏂瑰紡
+        token: '',  // 鍙�夊弬鏁� 濡傛灉闇�瑕乼oken楠岃瘉锛屽亣璁句綘鐨則oken鏈夊瓨鏀惧湪sessionStorage
+        name: 'upload_file',  // 蹇呭~鍙傛暟 鏂囦欢鐨勫弬鏁板悕
+        size: 10000000,  // 鍙�夊弬鏁�   鍥剧墖澶у皬锛屽崟浣嶄负Kb, 1M = 1024Kb
+        accept: 'multipart/form-data, image/png, image/gif, image/jpeg, image/bmp, image/x-icon,image/jpg'  // 鍙�� 鍙笂浼犵殑鍥剧墖鏍煎紡
+      } ,  //缂栬緫鍣ㄦ柊闂诲璞�
+      fileList:[],
+    }
+  },
+  created(){
+    // console.log('>>>>>>>',this.$route.query.id);
+    this.newsCategoryId = this.$route.query.id
+  },
+  methods:{
+    submit(){
+      const data = {
+        newsCategoryId:this.newsCategoryId,
+        content:this.content,
+        title:this.title,
+        releaseTime:this.releaseTime
+      }
+      add(data).then(res => {
+        console.log(res);
+        if(res.code !== 200){
+          return this.$message.error('鍙戝竷鏂伴椈澶辫触锛岃閲嶈瘯锛�')
+        }else{
+          this.$message.success('鏂伴椈鍙戝竷鎴愬姛锛�')
+          console.log(this.content);
+          this.$router.go(-1)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.box{
+  width: 1200px;
+  margin: 0 auto;
+}
+.myQuillEditor{
+  height: 350px;
+}
+.btn{
+  position: absolute;
+  bottom: 20px;
+  left: 168px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Administrator/Edit.vue b/src/components/Administrator/Edit.vue
index b9c3b0f..16e10cc 100644
--- a/src/components/Administrator/Edit.vue
+++ b/src/components/Administrator/Edit.vue
@@ -1,11 +1,25 @@
 <template>
   <div class="box">
+    <el-row><h3 style="margin-top: 0px">{{ $route.query.title }}</h3></el-row>
     鏂伴椈鏍囬锛�<el-input v-model="title" placeholder="璇疯緭鍏ユ柊闂绘爣棰�"></el-input><br/><br/>
-    鍙戝竷鏃ユ湡锛�<el-date-picker v-model="releaseTime" placeholder="璇烽�夋嫨鏂伴椈鍙戝竷鏃ユ湡"></el-date-picker><br/><br/>
+    鍙戝竷鏃ユ湡锛�<el-date-picker  format="yyyy 骞� MM 鏈� dd 鏃�" value-format="yyyy-MM-dd" v-model="releaseTime" placeholder="璇烽�夋嫨鏂伴椈鍙戝竷鏃ユ湡"></el-date-picker><br/><br/>
+    <!-- <el-upload
+      class="upload-demo"
+      ref="upload"
+      drag
+      action
+      :auto-upload="false"
+      :http-request="httpRequest"
+      multiple
+      :file-list="fileList">
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+      <div class="el-upload__tip" slot="tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+    </el-upload><br/> -->
     鏂伴椈鍐呭锛�<quill-editor ref="text" v-model="content" class="myQuillEditor" :options="editorOption" />
-    <div class="btn">
+    <el-row style="margin-top:50px;">
       <el-button  type="success" @click="submit">鍙戝竷</el-button>
-    </div>
+    </el-row>
   </div>
 </template>
 <script>
@@ -32,6 +46,7 @@
         size: 10000000,  // 鍙�夊弬鏁�   鍥剧墖澶у皬锛屽崟浣嶄负Kb, 1M = 1024Kb
         accept: 'multipart/form-data, image/png, image/gif, image/jpeg, image/bmp, image/x-icon,image/jpg'  // 鍙�� 鍙笂浼犵殑鍥剧墖鏍煎紡
       } ,  //缂栬緫鍣ㄦ柊闂诲璞�
+      fileList:[],
     }
   },
   created(){
@@ -39,7 +54,33 @@
     this.newsCategoryId = this.$route.query.id
   },
   methods:{
+    // jsonData(formData){ var jsonData = {}; formData.forEach((value, key) => jsonData[key] = value); return jsonData },
+    // httpRequest(params){
+    //   const pictureFile = params.file;
+    //   const newsCategoryId = this.newsCategoryId;
+    //   const content = this.content;
+    //   const title = this.title;
+    //   const releaseTime = this.releaseTime;
+    //   var formData = new FormData();
+    //   formData.append("pictureFile",pictureFile)
+    //   formData.append("newsCategoryId",newsCategoryId)
+    //   formData.append("content",content)
+    //   formData.append("title",title)
+    //   formData.append("releaseTime",releaseTime)
+    //   console.log(this.jsonData(formData));
+    //   add(this.jsonData(formData)).then(res => {
+    //     console.log(res);
+    //     if(res.code !== 200){
+    //       return this.$message.error('鍙戝竷鏂伴椈澶辫触锛岃閲嶈瘯锛�')
+    //     }else{
+    //       this.$message.success('鏂伴椈鍙戝竷鎴愬姛锛�')
+    //       console.log(this.content);
+    //       this.$router.go(-1)
+    //     }
+    //   })
+    // },
     submit(){
+      // this.$refs.upload.submit();
       const data = {
         newsCategoryId:this.newsCategoryId,
         content:this.content,
diff --git a/src/components/Administrator/EditLunBo.vue b/src/components/Administrator/EditLunBo.vue
new file mode 100644
index 0000000..a19f534
--- /dev/null
+++ b/src/components/Administrator/EditLunBo.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="box">
+    <el-row><h3 style="margin-top: 0px">{{ $route.query.title }}</h3></el-row>
+    鏂伴椈鏍囬锛�<el-input v-model="title" placeholder="璇疯緭鍏ユ柊闂绘爣棰�"></el-input><br/><br/>
+    鍙戝竷鏃ユ湡锛�<el-date-picker  format="yyyy 骞� MM 鏈� dd 鏃�" value-format="yyyy-MM-dd" v-model="releaseTime" placeholder="璇烽�夋嫨鏂伴椈鍙戝竷鏃ユ湡"></el-date-picker><br/><br/>
+    <el-upload
+      class="upload-demo"
+      drag
+      action="https://jsonplaceholder.typicode.com/posts/"
+      multiple>
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+      <div class="el-upload__tip" slot="tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+    </el-upload><br/>
+    鏂伴椈鍐呭锛�<quill-editor ref="text" v-model="content" class="myQuillEditor" :options="editorOption" />
+    <el-row style="margin-top:50px;">
+      <el-button  type="success" @click="submit">鍙戝竷</el-button>
+    </el-row>
+    杞挱鍥�
+  </div>
+</template>
+<script>
+import { add } from '../../api/api'
+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 {
+      title:'', //鏍囬鍐呭
+      releaseTime:'', //鍙戝竷鏃ユ湡
+      content: '',  //鏂伴椈鍐呭
+      newsCategoryId:2,
+      editorOption: {
+        placeholder: "璇疯緭鍏ユ鏂�",
+        // editorOption閲屾槸鏀惧浘鐗囦笂浼犻厤缃弬鏁扮敤鐨勶紝渚嬪锛�
+        action:  '/api/product/richtext_img_upload.do',  // 蹇呭~鍙傛暟 鍥剧墖涓婁紶鍦板潃
+        methods: 'POST',  // 蹇呭~鍙傛暟 鍥剧墖涓婁紶鏂瑰紡
+        token: '',  // 鍙�夊弬鏁� 濡傛灉闇�瑕乼oken楠岃瘉锛屽亣璁句綘鐨則oken鏈夊瓨鏀惧湪sessionStorage
+        name: 'upload_file',  // 蹇呭~鍙傛暟 鏂囦欢鐨勫弬鏁板悕
+        size: 10000000,  // 鍙�夊弬鏁�   鍥剧墖澶у皬锛屽崟浣嶄负Kb, 1M = 1024Kb
+        accept: 'multipart/form-data, image/png, image/gif, image/jpeg, image/bmp, image/x-icon,image/jpg'  // 鍙�� 鍙笂浼犵殑鍥剧墖鏍煎紡
+      } ,  //缂栬緫鍣ㄦ柊闂诲璞�
+    }
+  },
+  created(){
+    // console.log('>>>>>>>',this.$route.query.id);
+    this.newsCategoryId = this.$route.query.id
+  },
+  methods:{
+    submit(){
+      const data = {
+        newsCategoryId:this.newsCategoryId,
+        content:this.content,
+        title:this.title,
+        releaseTime:this.releaseTime
+      }
+      add(data).then(res => {
+        console.log(res);
+        if(res.code !== 200){
+          return this.$message.error('鍙戝竷鏂伴椈澶辫触锛岃閲嶈瘯锛�')
+        }else{
+          this.$message.success('鏂伴椈鍙戝竷鎴愬姛锛�')
+          console.log(this.content);
+          this.$router.go(-1)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.box{
+  width: 1200px;
+  margin: 0 auto;
+}
+.myQuillEditor{
+  height: 350px;
+}
+.btn{
+  position: absolute;
+  bottom: 20px;
+  left: 168px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Administrator/Main copy.vue b/src/components/Administrator/Main copy.vue
new file mode 100644
index 0000000..89c6fe5
--- /dev/null
+++ b/src/components/Administrator/Main copy.vue
@@ -0,0 +1,424 @@
+<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-row :gutter="40">
+          <el-col :span="4">
+            <!-- 娣诲姞鏂伴椈鎸夐挳 -->
+            <el-button el-button class="add" type="success" icon="el-icon-plus" @click="goEdit(newsCategoryId)">鐐瑰嚮鍦ㄨ鍒楄〃涓嬫坊鍔犱竴鏉℃柊闂�</el-button>
+          </el-col>
+          <el-col :span="10">
+            <!-- 鏂伴椈鎼滅储 -->
+            <el-input clearable @clear="qingKong()" placeholder="璇疯緭鍏ユ墍瑕佹煡璇㈢殑鏂伴椈鏍囬" v-model="fuzzyForm.fuzzytitle" class="input-with-select">
+              <el-button class="btn" slot="append" icon="el-icon-search" @click="fuzzyList(fuzzyForm.fuzzytitle)"></el-button>
+            </el-input>
+          </el-col>
+        </el-row>
+        <!-- 鏂伴椈琛ㄦ牸鍖哄煙 -->
+        <el-table v-show="gettable" :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">
+            <template slot-scope="scope">
+              <span>{{ (currentPage-1)*pageSize+scope.$index+1 }}</span>
+            </template>
+          </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="showEditDialog(scope.row.id)">淇敼</el-button>
+                <el-button type="info" @click="deleteNews(scope.row.id)">鍒犻櫎</el-button>
+              </div>
+            </template>
+            
+          </el-table-column>
+        </el-table>
+        <!-- 妯$硦鏌ヨ鐨勮〃鏍兼樉绀� -->
+        <el-table v-show="fuzzytable" :data="fuzzytableData" border style="width: 100%" :header-cell-style="{textAlign: 'center'}" :cell-style="{ textAlign: 'center' }">
+          <el-table-column type="index">
+            <template slot-scope="scope">
+              <span>{{ (fuzzyForm.fuzzycurrent-1)*fuzzyForm.fuzzysize+scope.$index+1 }}</span>
+            </template>
+          </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">
+              <div>
+                <el-button type="success" @click="look(scope.row.id)">鏌ョ湅</el-button>
+                <el-button type="warning" @click="showEditDialog(scope.row.id)">淇敼</el-button>
+                <el-button type="info" @click="deleteNews(scope.row.id)">鍒犻櫎</el-button>
+              </div>
+            </template>
+            
+          </el-table-column>
+        </el-table>
+        <!-- 鍒嗛〉 -->
+        <div>
+          <!-- 鑾峰彇鏂伴椈鍒楄〃鍒嗛〉 -->
+          <div>
+            <el-pagination
+              v-show="getShow"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[6,12, 18,]"
+              :page-size="100"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+            </el-pagination>
+          </div>
+          <!-- 妯$硦鏂伴椈鍒楄〃鍒嗛〉 -->
+          <div>
+            <el-pagination
+              v-show="fuzzyShow"
+              @size-change="handleSizeChangefuzzy"
+              @current-change="handleCurrentChangefuzzy"
+              :current-page="fuzzyForm.fuzzycurrent"
+              :page-sizes="[6,10, 18,]"
+              :page-size="100"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="fuzzyForm.fuzzytotal">
+            </el-pagination>
+          </div>
+        </div>
+      </el-card>
+      <!-- 淇敼鏂伴椈鐨勫璇濇 -->
+      <el-dialog
+        title="淇敼鏂伴椈"
+        :visible.sync="editDialogVisible"
+        width="50%"
+        :before-close="handleClose">
+        <!-- rules琛ㄥ崟楠岃瘉瑙勫垯锛宺ef褰撳墠琛ㄥ崟鐨勯獙璇佸璞� -->
+        <el-form ref="editFormRef" :model="editForm"  label-width="80px" status-icon>
+          <el-form-item label="id:">
+            <el-input v-model="editForm.id" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="鏂伴椈鏍囬:">
+            <el-input v-model="editForm.title"></el-input>
+          </el-form-item>
+          <el-form-item label="鍙戝竷鏃ユ湡:">
+            <el-date-picker v-model="editForm.releaseTime" type="date" placeholder="璇烽�夋嫨鍙戝竷鏃ユ湡"></el-date-picker>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="editDialogVisible = false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="editNew()">纭� 瀹�</el-button>
+        </span>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getNewsList,getnew,update,deleteNew,fuzzy } from '../../api/api'
+export default {
+  data() {
+    return {
+      getShow:true, //鑾峰彇鍒嗛〉鐨勬樉绀�(甯冨皵鍊�)
+      gettable:true,  //鑾峰彇琛ㄦ牸鐨勬樉绀�
+      visible: false,
+      editDialogVisible:false,  //鎺у埗淇敼瀵硅瘽妗嗙殑甯冨皵鍊�
+      editForm:{},  //鏌ヨ鍒扮殑鏂伴椈瀵硅薄锛岀洰鍓嶄粎渚涗慨鏀逛娇鐢�
+      newsCategoryId:1, //鍏堝瓨涓�涓皬鏍囬id
+      tableData:[],   //鏂伴椈鍒楄〃瀵硅薄
+      fuzzytableData:[],  //妯$硦鏌ヨ鍒楄〃瀵硅薄
+      pageSize:6,     //姣忛〉鏉℃暟
+      currentPage:1,  //褰撳墠椤�
+      total:0,        //鏂伴椈鎬绘潯鏁�
+      fuzzyShow:false,  //妯$硦鏌ヨ鍒嗛〉鐨勬樉绀�(甯冨皵鍊�)
+      fuzzytable:false, //妯$硦鏌ヨ琛ㄦ牸鐨勬樉绀�
+      fuzzyForm:{ fuzzytitle:'',fuzzytotal:0,fuzzycurrent:1,fuzzysize:6 },  //妯$硦鏌ヨ鍒楄〃瀵硅薄
+      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: {
+    //淇敼瀵硅瘽妗嗗叧闂殑鏂规硶
+    handleClose(done) {
+      this.$confirm('纭鍏抽棴锛�')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    },
+    //绾ц仈閫夋嫨鍣ㄧ殑鏂规硶
+    handleChange(value) {
+      // console.log(value);
+      // console.log(value[1]);
+      this.newsCategoryId = value[1]; //灏嗗緱鍒扮殑灏忔爣棰榠d瀛樻斁璧锋潵
+      this.query(this.newsCategoryId);
+    },
+    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);
+      })
+    },
+    //灞曠ず淇敼瀵硅瘽妗�
+    showEditDialog(id){
+      getnew(id).then(res => {
+        // console.log(res);
+        if (res.code == 200) {
+          this.editForm = res.data
+        }     
+      })
+      this.editDialogVisible = true;
+    },
+    //纭畾淇敼琛ㄥ崟鎻愪氦锛岄獙璇佸彂璧疯姹�
+    editNew(){
+      const data = {
+        id: this.editForm.id,
+        releaseTime: this.editForm.releaseTime,
+        title:this.editForm.title
+      }
+      update(data).then(res=>{
+        // console.log('dsadasas',res);
+        if (res.code == 200) {
+          this.editDialogVisible =false;
+          this.$message.success('淇敼鏂伴椈鎴愬姛锛�')
+          this.query(this.newsCategoryId);
+        }
+      })
+    },
+    //妯$硦鏌ヨ
+    fuzzyList(title){
+      // console.log(title);
+      if(title == ''){
+        return  this.$message.error('璇峰厛杈撳叆鏌ヨ鏂伴椈鏍囬锛�')
+      }
+      this.fuzzyShow = true //妯$硦鍒嗛〉鏄剧ず
+      this.getShow = false  //鑾峰彇鍒嗛〉闅愯棌
+      this.gettable = false
+      this.fuzzytable = true
+      const data = {
+        current: this.fuzzyForm.fuzzycurrent,
+        size: this.fuzzyForm.fuzzysize,
+        title:title
+      }
+      fuzzy(data).then(res => {
+        // console.log(res);
+        if (res.code !== 200) {
+          return this.$message.error('鏌ヨ鏂伴椈鍒楄〃澶辫触')
+        }else{
+          this.fuzzytableData = res.data.records
+          this.fuzzyForm.fuzzytotal = res.data.total
+        }
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    //娓呯┖鏌ヨ鍒楄〃鍐呭
+    qingKong(){
+      this.tableData = []
+      this.fuzzytableData = []
+      this.fuzzyForm.fuzzytotal = 0
+      this.fuzzyShow = false
+      this.getShow = true
+      this.fuzzytable = false
+      this.gettable = true
+    },
+    //鏍规嵁id鍒犻櫎鏂伴椈
+    async deleteNews(id){
+      // console.log(id);
+      const res = await this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ潯鏂伴椈, 鏄惁缁х画?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).catch(err => {
+        return err
+      })
+      //濡傛灉鐢ㄦ埛鐐瑰嚮纭畾鍒欒繑鍥瀋onfirm
+      //濡傛灉鐢ㄦ埛鐐瑰嚮鍙栨秷鍒欒繑鍥瀋ancel
+      console.log(res);
+      if(res !== 'confirm'){
+        return this.$message.info('宸插彇娑堝垹闄')
+      }else{
+        console.log(id);
+        const data = {
+          id:id
+        }
+        //鍙傛暟data 瑕佷互瀵硅薄鐨勫舰寮忎紶鍏�
+        deleteNew(data).then(res => {
+          console.log('>>>'+res);
+          if(res.code == 200){
+            this.$message.success('鍒犻櫎鏂伴椈鎴愬姛锛�')
+            this.query(this.newsCategoryId);
+          }else{
+            return this.$message.error('鍒犻櫎鏂伴椈澶辫触锛�')
+          }
+        })
+      }
+    },
+    //鏌ョ湅
+    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)
+    },
+    handleCurrentChangefuzzy(val){
+      this.fuzzyForm.fuzzycurrent = val
+      this.fuzzyList(this.fuzzyForm.fuzzytitle) //妯$硦鏌ヨ
+    },
+    handleSizeChangefuzzy(val){
+      this.fuzzyForm.fuzzysize = val
+      this.fuzzyList(this.fuzzyForm.fuzzytitle) //妯$硦鏌ヨ
+    },
+    //鍘诲線娣诲姞缂栬緫椤甸潰
+    goEdit(id){
+      if (this.newsCategoryId==27&&this.total==1||this.newsCategoryId==28&&this.total==1||this.newsCategoryId==29&&this.total==1||
+      this.newsCategoryId==30&&this.total==1||this.newsCategoryId==31&&this.total==1) {
+        this.$message.error('璇ユ柊闂绘爣棰樹笅鍙兘瀛樺湪涓�绡囨柊闂�')
+      }else if(this.newsCategoryId==27||this.newsCategoryId==28||this.newsCategoryId==29||this.newsCategoryId==30||
+      this.newsCategoryId==31||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({path:'/administrator/edit',query:{id:id}})
+        console.log(this.newsCategoryId);
+      }else{
+        this.$message.error('璇峰厛閫夋嫨鏂伴椈鏍囬')
+      } 
+    }
+  },
+}
+</script>
+
+<style lang="less">
+.add{
+  margin-bottom: 10px !important;
+}
+.block{
+  margin-bottom: 10px;
+}
+.el-pagination{
+  margin-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Administrator/Main.vue b/src/components/Administrator/Main.vue
index 5707748..76f7999 100644
--- a/src/components/Administrator/Main.vue
+++ b/src/components/Administrator/Main.vue
@@ -1,12 +1,13 @@
 <template>
   <div>
     <!-- 绾ц仈閫夋嫨鍣� -->
-     <div class="block">
+    <div class="block">
       <el-cascader
         v-model="value"
         :options="options"
         clearable
         filterable
+        :getCheckedNodes="true"
         @change="handleChange">
       </el-cascader>
     </div>
@@ -19,19 +20,23 @@
           </el-col>
           <el-col :span="10">
             <!-- 鏂伴椈鎼滅储 -->
-            <el-input clearable @clear="qingKong()" placeholder="璇疯緭鍏ユ墍瑕佹煡璇㈢殑鏂伴椈鏍囬" v-model="fuzzyForm.fuzzytitle" class="input-with-select">
-              <el-button class="btn" slot="append" icon="el-icon-search" @click="fuzzyList(fuzzyForm.fuzzytitle)"></el-button>
+            <el-input clearable placeholder="璇疯緭鍏ユ墍瑕佹煡璇㈢殑鏂伴椈鏍囬" v-model="search" class="input-with-select">
             </el-input>
           </el-col>
         </el-row>
         <!-- 鏂伴椈琛ㄦ牸鍖哄煙 -->
-        <el-table :data="tableData" border style="width: 100%" :header-cell-style="{textAlign: 'center'}" :cell-style="{ textAlign: 'center' }"
+        <el-table 
+          :data="tableData.filter(data => !search || data.title.toLowerCase().includes(search.toLowerCase()))"
+          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 type="index" label="搴忓彿" width="50">
+            <template slot-scope="scope">
+              <span>{{ (currentPage-1)*pageSize+scope.$index+1 }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="releaseTime" label="鏃ユ湡" width="" >
           </el-table-column>
           <el-table-column prop="title" label="鏂伴椈鏍囬" width="">
@@ -55,7 +60,6 @@
           <!-- 鑾峰彇鏂伴椈鍒楄〃鍒嗛〉 -->
           <div>
             <el-pagination
-              v-show="getShow"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="currentPage"
@@ -63,19 +67,6 @@
               :page-size="100"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total">
-            </el-pagination>
-          </div>
-          <!-- 妯$硦鏂伴椈鍒楄〃鍒嗛〉 -->
-          <div>
-            <el-pagination
-              v-show="fuzzyShow"
-              @size-change="handleSizeChangefuzzy"
-              @current-change="handleCurrentChangefuzzy"
-              :current-page="fuzzyForm.fuzzycurrent"
-              :page-sizes="[6,12, 18,]"
-              :page-size="100"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="fuzzyForm.fuzzytotal">
             </el-pagination>
           </div>
         </div>
@@ -95,8 +86,13 @@
             <el-input v-model="editForm.title"></el-input>
           </el-form-item>
           <el-form-item label="鍙戝竷鏃ユ湡:">
-            <!-- <el-input v-model="editForm.releaseTime"></el-input> -->
-            <el-date-picker v-model="editForm.releaseTime" type="date" placeholder="璇烽�夋嫨鍙戝竷鏃ユ湡"></el-date-picker>
+            <el-date-picker 
+              v-model="editForm.releaseTime" 
+              type="date" 
+              placeholder="璇烽�夋嫨鍙戝竷鏃ユ湡"
+              format="yyyy 骞� MM 鏈� dd 鏃�"
+              value-format="yyyy-MM-dd"
+            ></el-date-picker>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -113,16 +109,20 @@
 export default {
   data() {
     return {
-      fuzzyShow:false,  //妯$硦鏌ヨ鍒嗛〉鐨勬樉绀�(甯冨皵鍊�)
+      search:'',
       getShow:true, //鑾峰彇鍒嗛〉鐨勬樉绀�(甯冨皵鍊�)
+      gettable:true,  //鑾峰彇琛ㄦ牸鐨勬樉绀�
       visible: false,
       editDialogVisible:false,  //鎺у埗淇敼瀵硅瘽妗嗙殑甯冨皵鍊�
       editForm:{},  //鏌ヨ鍒扮殑鏂伴椈瀵硅薄锛岀洰鍓嶄粎渚涗慨鏀逛娇鐢�
       newsCategoryId:1, //鍏堝瓨涓�涓皬鏍囬id
       tableData:[],   //鏂伴椈鍒楄〃瀵硅薄
+      fuzzytableData:[],  //妯$硦鏌ヨ鍒楄〃瀵硅薄
       pageSize:6,     //姣忛〉鏉℃暟
       currentPage:1,  //褰撳墠椤�
       total:0,        //鏂伴椈鎬绘潯鏁�
+      fuzzyShow:false,  //妯$硦鏌ヨ鍒嗛〉鐨勬樉绀�(甯冨皵鍊�)
+      fuzzytable:false, //妯$硦鏌ヨ琛ㄦ牸鐨勬樉绀�
       fuzzyForm:{ fuzzytitle:'',fuzzytotal:0,fuzzycurrent:1,fuzzysize:6 },  //妯$硦鏌ヨ鍒楄〃瀵硅薄
       value: [],
       options: [{
@@ -139,6 +139,10 @@
         {
           value:44,
           label: '瀛﹂櫌鍔ㄦ��',
+        },
+        {
+          value:45,
+          label: '杞挱鍥�',
         }],
       },{
           value: 22,
@@ -223,6 +227,7 @@
     handleChange(value) {
       // console.log(value);
       // console.log(value[1]);
+      this.currentPage = 1;
       this.newsCategoryId = value[1]; //灏嗗緱鍒扮殑灏忔爣棰榠d瀛樻斁璧锋潵
       this.query(this.newsCategoryId);
     },
@@ -278,6 +283,8 @@
       }
       this.fuzzyShow = true //妯$硦鍒嗛〉鏄剧ず
       this.getShow = false  //鑾峰彇鍒嗛〉闅愯棌
+      this.gettable = false
+      this.fuzzytable = true
       const data = {
         current: this.fuzzyForm.fuzzycurrent,
         size: this.fuzzyForm.fuzzysize,
@@ -288,7 +295,7 @@
         if (res.code !== 200) {
           return this.$message.error('鏌ヨ鏂伴椈鍒楄〃澶辫触')
         }else{
-          this.tableData = res.data.records
+          this.fuzzytableData = res.data.records
           this.fuzzyForm.fuzzytotal = res.data.total
         }
       }).catch(err => {
@@ -298,9 +305,12 @@
     //娓呯┖鏌ヨ鍒楄〃鍐呭
     qingKong(){
       this.tableData = []
+      this.fuzzytableData = []
       this.fuzzyForm.fuzzytotal = 0
       this.fuzzyShow = false
       this.getShow = true
+      this.fuzzytable = false
+      this.gettable = true
     },
     //鏍规嵁id鍒犻櫎鏂伴椈
     async deleteNews(id){
@@ -358,6 +368,20 @@
     },
     //鍘诲線娣诲姞缂栬緫椤甸潰
     goEdit(id){
+      let title = '';
+      console.log(this.value);
+      if (this.value.length = 2) {
+        let t = this.value[0];
+        let i = this.value[1];
+        this.options.forEach( item => {
+          if(item.value == t){
+            title += item.label+'/'
+            item.children.forEach( e => {
+              if(e.value == i) title += e.label;
+            })
+          }
+        })
+      }
       if (this.newsCategoryId==27&&this.total==1||this.newsCategoryId==28&&this.total==1||this.newsCategoryId==29&&this.total==1||
       this.newsCategoryId==30&&this.total==1||this.newsCategoryId==31&&this.total==1) {
         this.$message.error('璇ユ柊闂绘爣棰樹笅鍙兘瀛樺湪涓�绡囨柊闂�')
@@ -366,11 +390,15 @@
       this.newsCategoryId==38||this.newsCategoryId==39||this.newsCategoryId==40||
       this.newsCategoryId==41||this.newsCategoryId==42||this.newsCategoryId==43||
       this.newsCategoryId==44){
-        this.$router.push({path:'/administrator/edit',query:{id:id}})
+        this.$router.push({path:'/administrator/edit',query:{id:id,title:title}})
         console.log(this.newsCategoryId);
+      }else if(this.newsCategoryId==45){
+        this.$router.push({path:'/administrator/editlunbo',query:{id:id,title:title}})
+        // console.log(this.newsCategoryId);
       }else{
         this.$message.error('璇峰厛閫夋嫨鏂伴椈鏍囬')
-      } 
+      }
+ 
     }
   },
 }
diff --git a/src/components/page/News.vue b/src/components/page/News.vue
index d96599e..be05aef 100644
--- a/src/components/page/News.vue
+++ b/src/components/page/News.vue
@@ -6,7 +6,7 @@
       <p>鍙戝竷鏃ユ湡锛歿{ releaseTime }} 鐐瑰嚮閲忥細[ {{hits}} ]</p>
     </div>
     <hr>
-    <div v-html="content"></div>
+    <div v-html="content" class="content"></div>
   </div>
 </template>
 <script>
@@ -40,6 +40,10 @@
 }
 </script>
 <style>
+.box {
+  width: 1200px;
+  margin: 0 auto;
+}
 .header h2{
   color: rgb(3, 73, 144);
   text-align: center;
@@ -50,8 +54,7 @@
   height: 35px;
   line-height: 35px;
 }
-.box {
-  width: 1200px;
-  margin: 0 auto;
-}
+/* .content span{
+  background-color: rgb(0, 0, 0);
+} */
 </style>
\ No newline at end of file
diff --git a/src/components/page/index.vue b/src/components/page/index.vue
index e7f3a9b..506c2ad 100644
--- a/src/components/page/index.vue
+++ b/src/components/page/index.vue
@@ -5,8 +5,8 @@
         <div class="block marr10">
           <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%;">
+              <div @click="gonew(item.id)" class="cursor">
+                <img :src="'http://localhost:8080/'+item.picturePath"  alt="" style="width:105%;">
               </div>
             </el-carousel-item>
           </el-carousel>
@@ -35,16 +35,42 @@
 import school from '../../views/school.vue'
 import other from '../../views/other.vue'
 
+import {getNewsList} from '../../api/api'
+
 export default {
   components: { notice, work, school, other },
   name: 'index',
   data(){
     return{
-      imgList:[
-        { path:require('../../assets/1.jpg'),index: 1},
-        { path:require('../../assets/2.jpg'),index: 2},
-        { path:require('../../assets/3.jpg'),index: 3},
-      ]
+      // imgList:[
+      //   { path:require('../../assets/1.jpg'),index: 1},
+      //   { path:require('../../assets/2.jpg'),index: 2},
+      //   { path:require('../../assets/3.jpg'),index: 3},
+      // ],
+      imgList:[],
+    }
+  },
+  created(){
+    this.getnews()
+  },
+  methods:{
+    getnews(){
+      const data ={
+        current:1,
+        newsCategoryId:45,
+        size:3
+      }
+      getNewsList(data).then(res => {
+        console.log(res);
+        if(res.code == 200){
+          this.imgList = res.data.records
+        }
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    gonew(id){
+      this.$router.push({path:'/home/news',query:{id:id}})
     }
   }
 }
diff --git a/src/components/page/introduce.vue b/src/components/page/introduce.vue
index 7ffe283..631982e 100644
--- a/src/components/page/introduce.vue
+++ b/src/components/page/introduce.vue
@@ -91,6 +91,7 @@
         // console.log(res);
         if(res.code == 200){
           this.new = res.data;
+          console.log(this.new.content);
         }
       }).catch(error => {
         console.log(error);
@@ -108,9 +109,6 @@
     line-height: 50px;
     text-align: center;
   }
-}
-.box-card{
-  // background-color: rgb(131, 212, 115);
 }
 .ft-blue {
   color: rgb(9, 143, 252);
diff --git a/src/components/page/kePuFengCai.vue b/src/components/page/kePuFengCai.vue
index cd9c1be..67ccf55 100644
--- a/src/components/page/kePuFengCai.vue
+++ b/src/components/page/kePuFengCai.vue
@@ -14,13 +14,16 @@
       </el-col>
        <!-- 鏂伴椈鍐呭 -->
       <el-card class="box-card">
-        <el-col :span="18">
+        <p class="name">{{this.cont}}</p>
+        <hr class="namehr">
+        <el-col :span="24">
           <div>
             <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-divider class="hr"></el-divider>
             </el-row>
           </div>
           <!-- 鍒嗛〉 -->
@@ -51,7 +54,7 @@
       cont: '',
       menuList: [],
       newsList:[],
-      pageSize:2,
+      pageSize:5,
       currentPage:1,
       total:0,
       item:{},
@@ -65,6 +68,7 @@
   watch: {
     menuList(n,o){
       this.cont =  this.menuList[0].name
+      this.item = this.menuList[0];
       this.getnews(this.menuList[0]);
     }
   },
@@ -131,11 +135,11 @@
   color: #000;
 }
 .box-card{
-  height: 600px;
+  height: 500px;
   position: relative;
   .fenye{
     position: absolute;
-    bottom: 2px;
+    bottom: 10px;
   }
 } 
 </style>
\ No newline at end of file
diff --git a/src/components/page/xueShuJiaoLiu.vue b/src/components/page/xueShuJiaoLiu.vue
index 00d0150..8f56845 100644
--- a/src/components/page/xueShuJiaoLiu.vue
+++ b/src/components/page/xueShuJiaoLiu.vue
@@ -14,13 +14,16 @@
       </el-col>
        <!-- 鏂伴椈鍐呭 -->
       <el-card class="box-card">
-        <el-col :span="18">
+        <p class="name">{{this.cont}}</p>
+        <hr class="namehr">
+        <el-col :span="24">
           <div>
             <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-divider class="hr"></el-divider>
             </el-row>
           </div>
           <!-- 鍒嗛〉 -->
@@ -51,7 +54,7 @@
       cont: '',
       menuList: [],
       newsList:[],
-      pageSize:2,
+      pageSize:5,
       currentPage:1,
       total:0,
       item:{},
@@ -65,6 +68,7 @@
   watch: {
     menuList(n,o){
       this.cont =  this.menuList[0].name
+      this.item = this.menuList[0];
       this.getnews(this.menuList[0]);
     }
   },
@@ -132,11 +136,11 @@
   color: #000;
 }
 .box-card{
-  height: 600px;
+  height: 500px;
   position: relative;
   .fenye{
     position: absolute;
-    bottom: 2px;
+    bottom: 10px;
   }
 } 
 </style>
\ No newline at end of file
diff --git a/src/components/page/zhengce.vue b/src/components/page/zhengce.vue
index c7d547f..475dddc 100644
--- a/src/components/page/zhengce.vue
+++ b/src/components/page/zhengce.vue
@@ -13,13 +13,16 @@
         </ul>
       </el-col>
       <el-card class="box-card">
-        <el-col :span="18">
+        <p class="name">{{this.cont}}</p>
+        <hr class="namehr">
+        <el-col :span="24">
           <div>
             <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-divider class="hr"></el-divider>
             </el-row>
           </div>
           <!-- 鍒嗛〉 -->
@@ -49,10 +52,10 @@
   },
   data() {
     return {
-      cont: '',
+      cont: '', //灏忔爣棰樺彉鑹�
       menuList: [],
       newsList:[],
-      pageSize:2,
+      pageSize:5,
       currentPage:1,
       total:0,
       item:{},
@@ -66,14 +69,11 @@
   watch: {
     menuList(n,o){
       this.cont =  this.menuList[0].name;
+      this.item = this.menuList[0];
       this.getnews(this.menuList[0]);
     }
   },
   methods: {
-    handleCurrentChange(val) {
-      console.log(`褰撳墠椤�: ${val}`);
-      this.getnews(this.item);
-    },
     getTitle(){
       const data = Number(this.$route.query.id);
       getMinTitle(data).then(res => {
@@ -107,6 +107,11 @@
         console.log(error);
       })
     },
+    handleCurrentChange(val) {
+      console.log(`褰撳墠椤�: ${val}`);
+      // this.currentPage = val
+      this.getnews(this.item);
+    },
     // 璺宠浆鍒版柊闂诲睍绀洪〉闈�
     show(item){
       // console.log(item.id);
@@ -118,7 +123,7 @@
 
 <style lang="less" scoped>
 ul {
-  width: 200px;
+  // width: 200px;
   li {
     background-color: rgb(242, 243, 245);
     height: 50px;
@@ -133,11 +138,11 @@
   color: #000;
 }
 .box-card{
-  height: 600px;
+  height: 500px;
   position: relative;
   .fenye{
     position: absolute;
-    bottom: 2px;
+    bottom: 10px;
   }
 } 
 </style>
\ No newline at end of file
diff --git a/src/router.js b/src/router.js
index eebd3de..2eae566 100644
--- a/src/router.js
+++ b/src/router.js
@@ -18,6 +18,7 @@
 import Welcome from './components/Administrator/Welcome.vue'
 import Main from './components/Administrator/Main.vue'
 import Edit from './components/Administrator/Edit.vue'
+import EditLunBo from './components/Administrator/EditLunBo.vue'
 
 
 Vue.use(Router)
@@ -31,7 +32,8 @@
       children: [{ path:'welcome',component:Welcome },
                 { path:'main',component:Main },
                 { path:'edit',component:Edit },
-                { path:'news',component:News },] 
+                { path:'news',component:News },
+                { path:'editlunbo',component:EditLunBo }] 
     },
     { 
       path: '/home', 

--
Gitblit v1.8.0