diff --git a/src/assets/images/defaultIcon.png b/src/assets/images/defaultIcon.png new file mode 100644 index 0000000..dea5cfa Binary files /dev/null and b/src/assets/images/defaultIcon.png differ diff --git a/src/assets/images/index_v2_bgc.png b/src/assets/images/index_v2_bgc.png new file mode 100644 index 0000000..129873f Binary files /dev/null and b/src/assets/images/index_v2_bgc.png differ diff --git a/src/assets/images/index_v2_bigBorder.png b/src/assets/images/index_v2_bigBorder.png new file mode 100644 index 0000000..5fa6c58 Binary files /dev/null and b/src/assets/images/index_v2_bigBorder.png differ diff --git a/src/assets/images/index_v2_border.png b/src/assets/images/index_v2_border.png new file mode 100644 index 0000000..ae41715 Binary files /dev/null and b/src/assets/images/index_v2_border.png differ diff --git a/src/assets/images/index_v2_error.png b/src/assets/images/index_v2_error.png new file mode 100644 index 0000000..37af91a Binary files /dev/null and b/src/assets/images/index_v2_error.png differ diff --git a/src/assets/images/index_v2_title.png b/src/assets/images/index_v2_title.png new file mode 100644 index 0000000..a8db154 Binary files /dev/null and b/src/assets/images/index_v2_title.png differ diff --git a/src/components/Echarts/BarChart.vue b/src/components/Echarts/BarChart.vue new file mode 100644 index 0000000..c3d289f --- /dev/null +++ b/src/components/Echarts/BarChart.vue @@ -0,0 +1,242 @@ + + + + diff --git a/src/components/Echarts/BarChartBlack.vue b/src/components/Echarts/BarChartBlack.vue new file mode 100644 index 0000000..98c3774 --- /dev/null +++ b/src/components/Echarts/BarChartBlack.vue @@ -0,0 +1,252 @@ + + + + diff --git a/src/main.js b/src/main.js index 607ec82..1536b80 100644 --- a/src/main.js +++ b/src/main.js @@ -38,7 +38,11 @@ import nodeWrap from '@/components/nodeWrap' import { delTreeChildren } from '@/utils/util' Vue.use(nodeWrap) Vue.component('NodeWrap', nodeWrap) // 初始化组件 - +// 柱状图、折线图组件 +import BarChart from "@/components/Echarts/BarChart"; +import BarChartBlack from "@/components/Echarts/BarChartBlack.vue"; +Vue.component("BarChart", BarChart); +Vue.component("BarChartBlack", BarChartBlack); import followWorkShow from '@/components/nodeWrapShow' Vue.use(followWorkShow) Vue.component('FollowWorkShow', followWorkShow) // 初始化组件 diff --git a/src/views/apiLogs/configData.js b/src/views/apiLogs/configData.js index c1b9dc6..cb07101 100644 --- a/src/views/apiLogs/configData.js +++ b/src/views/apiLogs/configData.js @@ -38,6 +38,11 @@ const tableColumnData = [ prop: 'createTime', tooltip: true, }, + { + label: '备注', + prop: 'remark', + tooltip: true, + }, ] const tableVersionColumn = [ { diff --git a/src/views/apiLogs/index.vue b/src/views/apiLogs/index.vue index 8493043..c6a7f8c 100644 --- a/src/views/apiLogs/index.vue +++ b/src/views/apiLogs/index.vue @@ -115,8 +115,6 @@ export default { prop: "status", tag: "elSelect", options: [ - {id: "1", label: "待发送"}, - {id: "2", label: "发送中"}, {id: "3", label: "发送成功"}, {id: "4", label: "发送失败"}, ], @@ -292,6 +290,11 @@ export default { this.$vmNews("请选择接受者api") return } + if (!data.status) { + this.$vmNews("请选择状态") + return + } + this.resetTable(); }, async initSelect() { diff --git a/src/views/apiLogs/rightDialog.vue b/src/views/apiLogs/rightDialog.vue index f7526f5..fd1fa11 100644 --- a/src/views/apiLogs/rightDialog.vue +++ b/src/views/apiLogs/rightDialog.vue @@ -1,46 +1,46 @@