diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue index 3dc3d3c32be812f2d71b2f426571d35ef292654a..04dc5500523887c409811341efe65d0e96f1ff42 100644 --- a/src/components/table/table-um.vue +++ b/src/components/table/table-um.vue @@ -53,12 +53,10 @@ :border="border" @select="select" @select-all="selectAll" - v-infinite-scroll="asynload" :defaultSelections="defaultSelections" element-loading-text="加载中..." :empty-text="emptyText" :stripe="stripe" - :style="{height:isLoad,overflow:isLoad?'auto':''}" row-key="id" :show-header="showHeader" default-expand-all @@ -266,8 +264,6 @@ export default { "v-apaas-table-filter": TableFilter }, props: { - //是否控制5行显示 - isLoad: "", //是否滚动加载 asyn_load1: { type: Boolean, default: false }, // 表格型号:mini,medium,small @@ -434,12 +430,6 @@ export default { } }, methods: { - asynload() { - console.log("111"); - if (this.asyn_load1) { - this.$emit("load_data"); - } - }, //本地删除 deleteLocal(val) { this.selectedTabsPage.splice(val.$index, 1); diff --git a/src/pages/authority/organization/organizationedit.vue b/src/pages/authority/organization/organizationedit.vue index 20b8937ecd8b016f5493af2b49ab442f9c4f7744..d621142fcf8fc81d1d4672047a45bfac800c482a 100644 --- a/src/pages/authority/organization/organizationedit.vue +++ b/src/pages/authority/organization/organizationedit.vue @@ -217,7 +217,7 @@ export default { this.$router.back(-1); }) .catch((response) => { - this.$message.success("保存失败"); + this.$message.error("保存失败"); }); }, backPage() { @@ -242,7 +242,7 @@ export default { this.$router.back(-1); }) .catch((response) => { - this.$message.success("保存失败"); + this.$message.error("保存失败"); }); }, getOriginArr() { diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue index a3facee95c341d63da5ca3ca93c3eef8ef9b06a4..23f8f0f2f465e3a2e29df2dba57f284eefce38b8 100644 --- a/src/pages/workbench/fwgl/serviceDetail.vue +++ b/src/pages/workbench/fwgl/serviceDetail.vue @@ -79,9 +79,16 @@

服务调用列表

+

服务规格:

@@ -164,6 +171,7 @@ import norCard from "@/components/card"; import exampleIcon from "@/pages/example/example_icon"; import Topology from "@/components/topology.vue"; import serviceHeader from "@/components/service-header"; +import ListPagination from "@/components/comments-pagination"; import dialogAction from "@/components/dialog-action"; import { getRole, formatDateTime_date } from "@/utils/common"; import { mapGetters, mapState } from "vuex"; @@ -177,11 +185,16 @@ export default { Topology, serviceHeader, dialogAction, + ListPagination, }, data() { return { now_user: 0, //0:普通用户,1:组织管理员,2:超级管理员 buy_style: [1], + listTotal: 0, + currentPage: 1, + pageSize: 10, + pageSizes: [10, 50, 100], responseParamUrl: "", codeExampleUrl: "", yx_state: { @@ -192,6 +205,7 @@ export default { maxTraffic: "", memory: "", }, + service_use_arr:[], res_data: [], //响应参数 buy_type: "", sizeset_flag: false, //规格设置是否显示 @@ -330,14 +344,14 @@ export default { label: "访问次数(次/日)", minWidth: "33.33%", align: "center", - type: "input", + type: "inputNumber", }, { prop: "pv", label: "访问量(PV/日)", minWidth: "33.33%", align: "center", - type: "input", + type: "inputNumber", }, { prop: "des", @@ -460,9 +474,42 @@ export default { } this.getServiceInfo(); this.getServiceyxztInfo(); + this.get_use_list(); }, mounted() {}, methods: { + changePageSize(value) { + this.pageSize = value; + this.currentPage = 1; + this.get_use_list(); + }, + changeCurrentPage(value) { + this.currentPage = value; + this.get_use_list(); + }, + get_use_list(){ + this.service_use_arr = [] + this.$http + .get(`/apaas/service/v3/service/manager/service/applys?service_id=${this.$route.params.id}&page=${this.currentPage}&size=${this.pageSize}`) + .then((response) => { + console.log(response); + if(response.data.success){ + this.listTotal = response.data.data.total + response.data.data.data.forEach(e => { + this.service_use_arr.push({ + dydw:e.apply_org_name, + dyr:e.apply_user_info.user_name, + dyyw:e.business_name, + ywxt:e.business_url, + cjms:e.scene, + sqsj:e.apply_time, + }) + }); + } + + }) + .catch(function(response) {}); + }, change_buy(val){ if(this.buy_style.indexOf(val)!==-1){ this.buy_style.splice(this.buy_style.indexOf(val),1) @@ -620,6 +667,8 @@ export default { } delete e.undefined; delete e.flag; + e.pv = parseInt(e.pv) + e.count = parseInt(e.count) temp.push(e); } }); @@ -635,7 +684,7 @@ export default { this.sizeset_flag = false; this.getsize_arr(); } else { - this.$message.success("保存失败"); + this.$message.error("保存失败"); } }); },