From 0e68368c1df02acb4e96c14b7f4a307d369f1415 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 25 十一月 2022 17:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/images/index.vue | 2 +-
src/api/system/bayonet.js | 21 ++++++++++++++++-----
src/views/operate/message/myIndex/index.vue | 1 +
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/api/system/bayonet.js b/src/api/system/bayonet.js
index 4b86582..df08a0a 100644
--- a/src/api/system/bayonet.js
+++ b/src/api/system/bayonet.js
@@ -1,7 +1,18 @@
import http from "@/http";
export default {
- getBayonetList: (params) => { return http.get('/sccg/equipment_bayonet/query', params); },
- exportBayonetList: (params) => { return http.downloadFile('/sccg/equipment_bayonet/export', params); },
- addBayonet: (params) => { return http.post('/sccg/equipment_bayonet/addition', params); },
- updateBayonet: (params) => { return http.put('/sccg/equipment_bayonet/modification', params) }
-}
+ getBayonetList: (params) => {
+ return http.get('/sccg/equipment_bayonet/query', params);
+ },
+ exportBayonetList: (params) => {
+ return http.get('/sccg/equipment_bayonet/export', params);
+ },
+ addBayonet: (params) => {
+ return http.post('/sccg/equipment_bayonet/addition', params);
+ },
+ updateBayonet: (params) => {
+ return http.put('/sccg/equipment_bayonet/modification', params)
+ },
+ deleteBayonet: (id) => {
+ return http.delete('/sccg/equipment_bayonet/delete/' + id)
+ }
+}
\ No newline at end of file
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index 75f17e9..8dd2d14 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -40,7 +40,7 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="baseId" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
+ <el-table-column prop="code" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="8">
<template v-if="scope.row.category" slot-scope="scope">
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 5f644da..7053110 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -254,6 +254,7 @@
startTime: this.datetime ? this.datetime[0] : null,
endTime: this.datetime ? this.datetime[1] : null
}
+ debugger
getMessageList(messageParam)
.then(({ records, total }) => {
this.tableData = records;
--
Gitblit v1.8.0