Skip to content

A
apaas-ui
Commit 0d1216ef authored by 赵伟庚's avatar 赵伟庚
Browse files
Options

up

parent 86e30e10
Hide whitespace changes
Inline Side-by-side
Showing with 257 additions and 69 deletions
.beagle.yml
View file @ 0d1216ef
......@@ -50,7 +50,7 @@ pipeline:
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.4
version: v3.0.5
channel: alpha
args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com
......@@ -69,8 +69,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
......@@ -87,7 +87,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -107,7 +107,7 @@ pipeline:
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-arm64
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.4
version: v3.0.5
channel: alpha-arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -126,8 +126,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-arm64
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
......@@ -144,7 +144,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-arm64
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -163,7 +163,7 @@ pipeline:
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-ppc64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.4
version: v3.0.5
channel: alpha-ppc64le
args: "TARGETOS=linux,TARGETARCH=ppc64le"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -181,8 +181,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-ppc64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
......@@ -198,7 +198,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-ppc64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -217,7 +217,7 @@ pipeline:
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-mips64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.4
version: v3.0.5
channel: alpha-mips64le
args: "TARGETOS=linux,TARGETARCH=mips64le"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -235,8 +235,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-mips64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
......@@ -252,7 +252,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-mips64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -269,7 +269,7 @@ pipeline:
namespace: apaas-v3
deployment: apaas-ui
container: apaas-ui
registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha
registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha
when:
branch:
- dev
......
src/components/service-list/commodity-list-new.vue
View file @ 0d1216ef
......@@ -119,6 +119,7 @@ export default {
methods: {
handleSizeChange(val) {
this.pagination.rowsPerPage = val;
this.pagination.page = 1
this.refreshData();
},
handleCurrentChange(val) {
......
src/components/service-list/service_list-new.vue
View file @ 0d1216ef
......@@ -182,6 +182,7 @@
>
{{ item.name }}
</div>
<div class="list_total">共{{total}}条数据</div>
<!-- <div v-if="urlFilter == 'app'" class="btn_right_check">
<el-checkbox v-model="couldTwice" @change="changeTwice">
支持二次开发
......@@ -197,15 +198,27 @@
"
></div> -->
<!-- the list -->
<commodity-list
:datas="lists && lists.length != 0 ? lists : []"
:total="total"
:url="url"
:urlFilter="urlFilter"
:paginationShow="false"
:pageSizeShow="true"
@refresh="getNewList"
></commodity-list>
<div class="shop_list">
<commodity-list
ref="commodity_list"
:datas="lists && lists.length != 0 ? lists : []"
:total="total"
:url="url"
:urlFilter="urlFilter"
@refresh="getNewList"
></commodity-list>
</div>
<div class="pagination_box">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page"
:page-sizes="[10, 20, 50]"
:page-size="limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</template>
......@@ -242,6 +255,20 @@ export default {
],
activeOptions: [[], [], [], []],
activeChildOptions: [[], [], [], []],
pageOptions: [
{
value: "10",
label: "10",
},
{
value: "20",
label: "20",
},
{
value: "50",
label: "50",
},
],
buttonFilter: [
{
name: "综合排序",
......@@ -286,7 +313,7 @@ export default {
},
],
page: 1,
limit: 20,
limit: 10,
couldTwice: false,
refresh_app_1: false,
refresh_app_2: false,
......@@ -297,11 +324,11 @@ export default {
}),
mounted() {
window.addEventListener("resize", this.judgeHeight);
window.addEventListener("scroll", this.menu, true);
// window.addEventListener("scroll", this.menu, true);
},
destroyed() {
window.removeEventListener("resize", this.judgeHeight);
window.removeEventListener("scroll", this.menu, true);
// window.removeEventListener("scroll", this.menu, true);
},
watch: {
urlFilter: {
......@@ -357,22 +384,31 @@ export default {
},
},
methods: {
menu() {
if (this.isKaiGuan) {
let scroll =
this.getScrollTop() + this.getWindowHeight() - this.getScrollHeight();
if (scroll > -10) {
if (
(this.total != 0 && this.page * this.limit < this.total) ||
this.total == 0
) {
this.page++;
this.getShopList();
}
}
}
},
// menu() {
// if (this.isKaiGuan) {
// let scroll =
// this.getScrollTop() + this.getWindowHeight() - this.getScrollHeight();
// if (scroll > -10) {
// if (
// (this.total != 0 && this.page * this.limit < this.total) ||
// this.total == 0
// ) {
// this.page++;
// this.getShopList();
// }
// }
// }
// },
//滚动条在Y轴上的滚动距离
handleSizeChange(val) {
this.limit = val;
this.page = 1
this.getShopList()
},
handleCurrentChange(val) {
this.page = val;
this.getShopList()
},
getScrollTop() {
var documentScrollTop = 0;
documentScrollTop = document.documentElement.scrollTop;
......@@ -406,10 +442,11 @@ export default {
};
this.$api.serviceShop.getAppList(query).then((response) => {
if (response.data.success == "1") {
this.lists =
this.page == 1
? response.data.data
: this.lists.concat(response.data.data);
// this.lists =
// this.page == 1
// ? response.data.data
// : this.lists.concat(response.data.data);
this.lists = response.data.data
this.total = response.data.total;
this.isKaiGuan = true;
} else {
......@@ -430,10 +467,11 @@ export default {
};
this.$api.serviceShop.getServiceShopList(query).then((response) => {
if (response.data.success == "1") {
this.lists =
this.page == 1
? response.data.data
: this.lists.concat(response.data.data);
// this.lists =
// this.page == 1
// ? response.data.data
// : this.lists.concat(response.data.data);
this.lists = response.data.data
this.total = response.data.total;
this.isKaiGuan = true;
} else {
......@@ -582,7 +620,7 @@ export default {
getNewList(val) {
console.log(val);
this.page = 1;
this.limit = 20;
this.limit = 10;
this.getShopList();
},
clickAll(item) {
......@@ -771,6 +809,11 @@ export default {
margin-left: 15px;
position: relative;
}
.list_total {
position: absolute;
right: 16px;
top: 0;
}
.btn_right_check {
position: absolute;
right: 20px;
......@@ -785,8 +828,7 @@ export default {
.head_flex .input_right .el-input--prefix .el-input__inner {
padding-left: 40px;
}
.head_flex .input_right .el-input__prefix,
.el-input__suffix {
.head_flex .input_right .el-input__prefix{
left: 10px;
}
.head_flex .input_right .el-input--prefix .el-input__inner {
......@@ -810,3 +852,22 @@ export default {
border-color: #626de9;
}
</style>
<style scoped>
.shop_list {
margin-bottom: 40px;
}
.pagination_box {
width: 1008px;
height: 50px;
position: fixed;
bottom: 0;
background-color: #f6f7fb;
text-align: center;
line-height: 50px;
}
.pagination_box /deep/.el-pagination>.btn-prev,
.pagination_box /deep/.el-pagination>.btn-next,
.pagination_box /deep/.el-pagination>.el-pager>li {
background-color: transparent!important;
}
</style>
src/components/table/table-um.vue
View file @ 0d1216ef
......@@ -135,7 +135,7 @@
<em
class="cur_pointer"
v-else
:class="btn.type"
:class="btn.disabledRule ? btn.type : 'disabled_btn ' + btn.type"
:style="{
color: btn.label == '删除' ? '#830f53' : '#0f2683',
}"
......@@ -835,6 +835,10 @@ em {
.cur_pointer {
cursor: pointer;
}
.disabled_btn {
cursor: not-allowed;
color: #999!important;
}
.ces-table .el-table--mini td,
.ces-table .el-table--mini th {
padding: 11px 0 !important;
......
src/pages/workbench/fwgl/apply_service_detail.vue
View file @ 0d1216ef
......@@ -101,6 +101,12 @@
:readOnly="true"
></v-apaas-code>
</info-list>
<!-- <info-list v-else-if="now_service == 2">
<process-card
:data="use_approval_arr"
slot="approval"
></process-card>
</info-list> -->
<info-list
v-else
:list_arr="
......@@ -110,9 +116,18 @@
: list_arr
: now_service == 1
? servicead_arr
: now_service == 2
? jkwd_arr
: apply_arr
"
>
<table-um
:stripe="true"
:headers="jkwd_headers"
:datas="jkwd_datas"
@download="download"
slot="wd_table"
></table-um>
<table-um
v-if="res_table_arr.length"
:headers="res_header_arr"
......@@ -156,6 +171,7 @@ import infoList from "@/components/infoList";
import tableUm from "@/components/table/table-um";
import processCard from "@/components/process-card";
import codes from "@/components/general/codes";
import helper from "@/services/helper";
export default {
props: {},
components: {
......@@ -524,7 +540,7 @@ export default {
],
},
],
service_arr: ["服务基本信息", "接口详细信息", "申请审批信息"],
service_arr: ["服务基本信息", "接口详细信息","接口文档", "申请审批信息"],
data_service_type1: "",
service_header_arr: {
id: "",
......@@ -659,6 +675,17 @@ export default {
solt_name: "res_code",
},
],
jkwd_arr: [
{
title: "",
info: "",
type: "solt",
solt_name: "wd_table",
},
],
jkwd_headers: [],
jkwd_datas: [],
clickFlag: false,
apply_arr: [
{
title: "申请信息",
......@@ -754,6 +781,14 @@ export default {
},
mounted() {},
methods: {
download(row) {
if (this.clickFlag) {
const a = document.createElement("a"); // 创建a标签
a.setAttribute("download", ""); // download属性
a.setAttribute("href", row.url); // href链接
a.click(); // 自执行点击事件
}
}, // 下载接口文档
change_port(val) {
this.port_options.forEach((e) => {
if (e.value == val) {
......@@ -778,6 +813,37 @@ export default {
return;
}
let data = response.data.data;
// 审批通过才可以下载接口文档，待审批、审批中、审批不通过不可以下载
if (data.service_apply_info.approval_status == 3) {
this.clickFlag = true
}else {
this.clickFlag = false
}
if (data.doc_file != '') {
this.jkwd_datas.push({
wd_name: helper.downloadFileFormat(data.doc_file),
url: data.doc_file
})
}
this.jkwd_headers = [
{
prop: "wd_name",
label: "文档名称",
align: "left",
},
{
label: "操作",
type: "Button",
align: "center",
btnList: [
{
type: "download",
label: "下载",
disabledRule: this.clickFlag == true
},
],
},
],
this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id
this.$set(this.service_header_arr, "workflows_id", data.workflows_id); // 时空服务id
this.$set(
......
src/pages/workbench/fwgl/serviceDetail.vue
View file @ 0d1216ef
......@@ -24,7 +24,7 @@
:style="
now_service == index ? { borderBottom: '4px solid #f5ab4c' } : {}
"
v-if="index < 3 || in_origin_ser"
v-if="index < 4 || in_origin_ser"
>
{{ item }}
</div>
......@@ -288,13 +288,19 @@
></list-pagination>
</div>
<div v-show="now_service == 3">
<p style="color: #8890a7">服务规格：</p>
<table-um
:stripe="true"
:headers="jkwd_headers"
:datas="jkwd_datas"
@download="download"
></table-um>
<!-- <p style="color: #8890a7">服务规格：</p>
<table-um
:stripe="true"
:headers="service_size_arr"
:datas="service_size_data"
></table-um>
<!-- <p style="color: #8890a7;">购买方式：</p>
<p style="color: #8890a7;">购买方式：</p>
<p style="color: #242c43;margin:10px 0px;">
{{
buy_type == 1
......@@ -303,7 +309,7 @@
? "按年购买"
: "按月购买&按年购买"
}}
</p> -->
</p>
<div
class="editbtn"
v-if="now_user == 1"
......@@ -330,7 +336,7 @@
:datas="service_size_data"
@changeTable="now_size_data"
></table-um>
<!-- <p
<p
v-if="now_user == 1 && sizeset_flag"
style="color: #8890a7;margin:10px 0;"
>
......@@ -347,11 +353,11 @@
:type="buy_style.indexOf(2) !== -1 ? 'primary' : ''"
@click="change_buy(2)"
>按年购买</el-button
> -->
>
<div class="savebtn" v-if="now_user == 1 && sizeset_flag">
<el-button @click="change_service_size">保存</el-button>
<el-button @click="sizeset_flag = false">取消</el-button>
</div>
</div> -->
</div>
<div v-show="now_service == 4">
<info-list :list_arr="trans_log_arr">
......@@ -468,6 +474,25 @@ export default {
times: 0,
month: 0,
},
jkwd_headers: [
{
prop: "wd_name",
label: "文档名称",
align: "left",
},
{
label: "操作",
type: "Button",
align: "center",
btnList: [
{
type: "download",
label: "下载",
},
],
},
],
jkwd_datas: [],
trans_log_arr: [
{
title: "服务交易概览",
......@@ -739,18 +764,19 @@ export default {
workflows_id: "", //判断是否是流程服务
sizeset_flag: false, //规格设置是否显示
service_arr: [
["服务基本信息", "接口详细信息", "服务运行状态"],
["服务基本信息", "接口详细信息", "服务运行状态","接口文档"],
[
"服务基本信息",
"接口详细信息",
"服务运行状态",
// "服务计费规则",
// "服务交易记录",
"接口文档"
],
[
"服务基本信息",
"接口详细信息",
"服务运行状态",
"服务运行状态","接口文档"
// "服务规格",
// "服务交易记录",
],
......@@ -1272,6 +1298,14 @@ export default {
},
mounted() {},
methods: {
download(row) {
console.log(row.url)
const a = document.createElement("a"); // 创建a标签
a.setAttribute("download", ""); // download属性
a.setAttribute("href", row.url); // href链接
a.click(); // 自执行点击事件
}, // 下载接口文档
change_port(val) {
this.port_options.forEach((e) => {
if (e.value == val) {
......@@ -1665,6 +1699,12 @@ export default {
});
this.service_size_data = temp;
this.size_arr_down = temp;
if (data.doc_file != '') {
this.jkwd_datas.push({
wd_name: helper.downloadFileFormat(data.doc_file),
url: data.doc_file
})
}
} else {
this.$message({
message: response.data.errMsg,
......
src/pages/workbench/fwzc_fwcs.vue
View file @ 0d1216ef
......@@ -125,14 +125,26 @@
<el-radio label="xml">XML</el-radio>
</el-radio-group>
</div>
<div class="fwcs_fwdz">
接口协议：
</div>
<el-radio-group
v-model="jkxy"
class="jkxy"
>
<el-radio label="http(s)">http(s)</el-radio>
<el-radio label="grpc">grpc</el-radio>
<el-radio label="websocket">websocket</el-radio>
</el-radio-group>
<div
v-if="!(activeBtn == 4 && zhyyVal == 24)"
v-if="!(activeBtn == 4 && zhyyVal == 24) || jkxy !== 'http(s)'"
class="fwcs_fwdz"
>
服务地址：
</div>
<div
v-if="!(activeBtn == 4 && zhyyVal == 24)"
v-if="!(activeBtn == 4 && zhyyVal == 24) || jkxy !== 'http(s)'"
class="fwcs_fwdz_inner"
>
<el-input
......@@ -188,7 +200,7 @@
服务测试
</el-button>
</div>
<div v-if="activeBtn == 0 || activeBtn == 2 || activeBtn == 3">
<div v-if="activeBtn == 0 || activeBtn == 2 || activeBtn == 3 || jkxy == 'http(s)'">
<el-tabs
v-model="activeName"
class="fwcs_tabs"
......@@ -991,6 +1003,7 @@ export default {
},
data() {
return {
jkxy: "http(s)",
liucheng_list: [
{
one_input: "",
......@@ -2646,6 +2659,9 @@ export default {
.gz_fhsjgs_rad {
margin-left: 10px;
}
.jkxy {
margin-left: 20px;
}
.ip_block {
border-radius: 8px;
border: solid 1px #e3e5ef;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment