zhangxin 2 жил өмнө
parent
commit
71739a8bfe

+ 93 - 92
package.json

@@ -1,92 +1,93 @@
-{
-  "name": "ruoyi",
-  "version": "3.8.5",
-  "description": "若依管理系统",
-  "author": "若依",
-  "license": "MIT",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "keywords": [
-    "vue",
-    "admin",
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "admin-template",
-    "management-system"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
-  },
-  "dependencies": {
-    "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
-    "clipboard": "2.0.8",
-    "core-js": "3.25.3",
-    "echarts": "5.4.0",
-    "element-ui": "2.15.10",
-    "file-saver": "2.0.5",
-    "fuse.js": "6.4.3",
-    "highlight.js": "9.18.5",
-    "js-beautify": "1.13.0",
-    "js-cookie": "3.0.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "mockjs": "^1.1.0",
-    "nprogress": "0.2.0",
-    "quill": "1.3.7",
-    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
-    "vue": "2.6.12",
-    "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
-    "vue-meta": "2.4.0",
-    "vue-quill-editor": "^3.0.6",
-    "vue-router": "3.4.9",
-    "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "chalk": "4.1.0",
-    "compression-webpack-plugin": "5.0.2",
-    "connect": "3.6.6",
-    "eslint": "7.15.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "runjs": "4.4.2",
-    "sass": "^1.32.13",
-    "sass-loader": "10.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "svg-sprite-loader": "5.1.1",
-    "vue-template-compiler": "2.6.12"
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
-}
+{
+  "name": "ruoyi",
+  "version": "3.8.5",
+  "description": "若依管理系统",
+  "author": "若依",
+  "license": "MIT",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "vue",
+    "admin",
+    "dashboard",
+    "element-ui",
+    "boilerplate",
+    "admin-template",
+    "management-system"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+  },
+  "dependencies": {
+    "@riophae/vue-treeselect": "0.4.0",
+    "axios": "0.24.0",
+    "clipboard": "2.0.8",
+    "core-js": "3.25.3",
+    "echarts": "5.4.0",
+    "element-ui": "2.15.10",
+    "file-saver": "2.0.5",
+    "fuse.js": "6.4.3",
+    "highlight.js": "9.18.5",
+    "js-beautify": "1.13.0",
+    "js-cookie": "3.0.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "mitt": "^3.0.0",
+    "mockjs": "^1.1.0",
+    "nprogress": "0.2.0",
+    "quill": "1.3.7",
+    "screenfull": "5.0.2",
+    "sortablejs": "1.10.2",
+    "vue": "2.6.12",
+    "vue-count-to": "1.0.13",
+    "vue-cropper": "0.5.5",
+    "vue-meta": "2.4.0",
+    "vue-quill-editor": "^3.0.6",
+    "vue-router": "3.4.9",
+    "vuedraggable": "2.24.3",
+    "vuex": "3.6.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "4.4.6",
+    "@vue/cli-plugin-eslint": "4.4.6",
+    "@vue/cli-service": "4.4.6",
+    "babel-eslint": "10.1.0",
+    "babel-plugin-dynamic-import-node": "2.3.3",
+    "chalk": "4.1.0",
+    "compression-webpack-plugin": "5.0.2",
+    "connect": "3.6.6",
+    "eslint": "7.15.0",
+    "eslint-plugin-vue": "7.2.0",
+    "lint-staged": "10.5.3",
+    "runjs": "4.4.2",
+    "sass": "^1.32.13",
+    "sass-loader": "10.1.1",
+    "script-ext-html-webpack-plugin": "2.1.5",
+    "svg-sprite-loader": "5.1.1",
+    "vue-template-compiler": "2.6.12"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
+}

+ 22 - 0
src/api/message/message.js

@@ -14,4 +14,26 @@ export function deleteMessage(id) {
     url: '/post/news/' + id,
     method: 'delete'
   })
+}
+//查询信息  
+export function searchMessage(id) {
+  return request({
+    url: '/post/news/' + id,
+    method: 'get'
+  })
+}
+//获取详情 
+export function moreMessage(id) {
+  return request({
+    url: '/post/news/' + id,
+    method: 'post'
+  })
+}
+
+//search
+export function searchJMessage(title) {
+  return request({
+    url: '/post/news/list?newsTitle=' + title,
+    method: 'get'
+  })
 }

+ 2 - 0
src/utils/mitt.js

@@ -0,0 +1,2 @@
+import mitt from 'mitt'
+export default new mitt();

+ 41 - 3
src/views/message/messageDetails.vue

@@ -9,17 +9,51 @@
       <div class="noticeContent">
         邮贝数字邮局,是由中国邮政集团有限公司北京市公司设立,同时使用人民日报全国党媒联盟链进行数字邮品和数字产品的登记、认证与确权,服务广大集邮用户和数字收藏爱好者的邮政官方数字邮品和数字产品发行平台。邮贝数字邮局由北京游贝数字科技有限公司负责运营。
       </div>
+      
     </div>
+    
   </div>
 </template>
 
+<script>
+import { moreMessage } from '../../api/message/message.js'
+import mitt from '@/utils/mitt.js';
+export default {
+  props: {
+    
+  },
+  data() {
+    return {
+      num:1
+    }
+  },
+  mounted() {
+    this.getList();
+    mitt.on("searchMore",(data)=>{
+      console.log("*******");
+      console.log(data);
+    })
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    getList() {
+      moreMessage().then((res) => {
+        console.log(res);
+      })
+    },
+  }
+}
+
 
+</script>
 
 <style scoped>
-#returnBtn{
-    margin-top: 10px;
-    margin-left: 10px;
+#returnBtn {
+  margin-top: 10px;
+  margin-left: 10px;
 }
+
 .noticeDetails {
   width: 800px;
   height: 300px;
@@ -27,6 +61,7 @@
   margin: 50px auto;
   border: 1px solid #ebeef5;
 }
+
 .title {
   font-size: 30px;
   font-family: PingFang SC;
@@ -35,6 +70,7 @@
   font-weight: bolder;
   margin-top: 10px;
 }
+
 #noticeTitle {
   /* font-size: 18px; */
   font-family: PingFang SC;
@@ -43,11 +79,13 @@
   margin-top: 20px;
   font-weight: bolder;
 }
+
 #noticeTime {
   font-family: PingFang SC;
   margin-left: 30px;
   color: #333333;
 }
+
 .noticeContent {
   font-family: PingFang SC;
   color: #333333;

+ 34 - 22
src/views/message/messageList.vue

@@ -4,8 +4,8 @@
       <div>
         <div class="up-title"><i class="el-icon-search"></i>筛选搜索</div>
         <div class="btn">
-          <el-button plain>重置</el-button>
-          <el-button type="primary" plain>查询列表</el-button>
+          <el-button plain @click="reset">重置</el-button>
+          <el-button type="primary" @click="searchJingMessage" plain>查询列表</el-button>
         </div>
       </div>
       <div class="left-up">
@@ -28,8 +28,7 @@
         </el-row>
       </div>
       <div class="down-table">
-        <el-table :data="tableData" 
-        order style="width: 100%" class="messagetable">
+        <el-table :data="tableData" order style="width: 100%" class="messagetable">
           <el-table-column prop="newsId" label="ID">
           </el-table-column>
           <el-table-column :formatter="stateFormat" prop="newsTitle" label="消息标题">
@@ -40,10 +39,10 @@
           </el-table-column>
           <el-table-column prop="operate" label="操作">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" @click="viewDetails(scope.$index)">查看详情</el-button>
+              <el-button size="mini" type="text" @click="viewDetails(scope)">查看详情</el-button>
               <el-popconfirm title="你确定删除本条消息吗?" @confirm="deleteMessage(scope)">
                 <el-button class="btn-delete" size="mini" type="text" icon="el-icon-delete"
-                   slot="reference">删除</el-button>
+                  slot="reference">删除</el-button>
               </el-popconfirm>
             </template>
           </el-table-column>
@@ -52,8 +51,8 @@
     </div>
     <div class="bottom">
       <div class="bottom-page">
-        <el-pagination  layout="prev, pager, next" :total="mockMessageList.length"  @size-change="handleSizeChange"
-      @current-change="handleCurrentChange">
+        <el-pagination layout="prev, pager, next" :total="mockMessageList.length" @size-change="handleSizeChange"
+          @current-change="handleCurrentChange">
         </el-pagination>
       </div>
       <span class="bottom-number">共{{ mockMessageList.length }}条 </span>
@@ -61,7 +60,8 @@
   </div>
 </template>
 <script>
-import { getMessage , deleteMessage} from '../../api/message/message.js'
+import { getMessage, deleteMessage, searchJMessage } from '../../api/message/message.js'
+import mitt from '@/utils/mitt.js';
 export default {
   props: {
 
@@ -73,25 +73,25 @@ export default {
       value2: "",
       mock: "",
       mockMessageList: [],
-      currentPage : 1,
-      pagesize : 10 
+      currentPage: 1,
+      pagesize: 10
     }
   },
   mounted() {
     this.getMockMessageList();
-  
+
   },
   beforeDestroy() {
   },
   methods: {
     getMockMessageList() {
-      getMessage().then((res)=>{
+      getMessage().then((res) => {
         this.tableData = res.rows
         console.log(res.rows);
       })
     },
     //分页功能
-    getPageData(){
+    getPageData() {
       console.log(this.mockMessageList);
       let start = (this.currentPage - 1) * this.pagesize;
       let end = start + this.pagesize;
@@ -117,7 +117,7 @@ export default {
       console.log(row);
       row = row.row.newsId
       console.log(row);
-      deleteMessage(row).then ((res)=>{
+      deleteMessage(row).then((res) => {
         console.log(res);
         this.$message({
           message: '恭喜你,删除成功!',
@@ -128,17 +128,29 @@ export default {
     },
     //查看详情
     viewDetails(row) {
-      this.$router.push({
-        name: "messageDetails",
-        query: {
-          publishTime: '时间',
-          title: '标题'
-        }
-      });
+      row = row.row.newsId
+      mitt.emit('searchMore', row)
+      this.$router.push("/messageList/messageDetails");
     },
     //添加跳转
     addNoticce() {
       this.$router.push("/messageList/addMessage");
+    },
+    //搜索
+    searchJingMessage() {
+      // console.log(this.input );
+      searchJMessage(
+        this.input
+      ).then((res) => {
+        console.log(res);
+        this.tableData = res.rows
+      })
+      this.reset();
+    },
+    //重置
+    reset() {
+      this.input = "" 
+      this.value2 = ""
     }
   }
 }