+ 
diff --git a/src/components/service-header.vue b/src/components/service-header.vue
index 9a5e73aebedc503484bb1cdbed2770eae0170ce3..721e2a8c1a55a2f7a4a814b2f231f7c2af344ee8 100644
--- a/src/components/service-header.vue
+++ b/src/components/service-header.vue
@@ -306,7 +306,8 @@ export default {
.info_detail p {
color: #8890a7;
}
-.info_detail span {
+.info_detail span,
+.info_detail a {
color: #242c43;
font-weight: 600;
margin-right: 48px;
diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index 5ee4b8a5c7c6252b8569094a51706bf6225923b0..e96404630b1ca4d4f4d594aefc5b495eff98dff2 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -1,5 +1,5 @@
-
+
@@ -89,7 +89,13 @@
class="commodity_text"
>暂无
-
+
item.type))
);
-
if (types.indexOf(3) > -1) {
this.types = [
{
@@ -316,6 +328,7 @@ export default {
) {
this.specification = this.data.serviceRequestSpcs.spcs_type_2[0];
}
+ this.showItem = true;
},
};
diff --git a/src/components/service-list/commodity-card.vue b/src/components/service-list/commodity-card.vue
index 62c8c1fe0a0c544d2303f119e707ebad29e857e1..f1ac687d268cdcdedaa7b4ea7f3da5f1907fed14 100644
--- a/src/components/service-list/commodity-card.vue
+++ b/src/components/service-list/commodity-card.vue
@@ -1,42 +1,73 @@
-
-
- ![]()
-
-
{{ cellData.app_name }}
- V{{ cellData.version }}
+
+
+
-
+ ![]()
-
-
- ![]()
上线时间
+
-
+
-
+
+
+
+ {{ cellData.app_name }} ( V{{ cellData.version }} )
+
+
+
+
+ 本月获取： + + {{ cellData.deploy_times }} + + 次 +
+{{ helper.dateStringTransform(cellData.create_date) }}
-
-
- ![]()
部署次数
+
-
+ 
-
{{ cellData.deploy_times }}
- 加入购物车
- 查看详情
+
\ No newline at end of file
diff --git a/src/components/service-list/commodity-cell.vue b/src/components/service-list/commodity-cell.vue
index 559a728f70f0fc4537ff8ac2a1cc0cf401d6857a..8e1dab490202f235f2eed78676e33834a52b8531 100644
--- a/src/components/service-list/commodity-cell.vue
+++ b/src/components/service-list/commodity-cell.vue
@@ -1,52 +1,70 @@
+
+
+ 应用类型：
+ {{ cellData.type_name }}
+ {{ cellData.data_service_type2_name }} {{
+ cellData.data_service_type3_name
+ }}
+
+
+ 业务领域：
+ {{ cellData.ywly_name }}
+
+
+ 上线时间：
+ {{ helper.dateStringTransform(cellData.create_date) }}
+
+
+ {{ cellData.yyjj }} +
+
-
- ![]()
-
-
-
- {{ cellData.name }}
-
-
-
-
+
+
+ ![]()
-
-
-
- {{ cellData.descript }}
+
+
-
+
-
+
+ {{ cellData.name }}
+
-
- 服务类型：
{{ cellData.data_service_type1_name }} {{ cellData.data_service_type2_name }} {{ cellData.data_service_type3_name }}
- 数据领域：
- {{ cellData.sectors_name }}
+ v-if="cellData.data_service_type1 == 6"
+ class="tags map_service"
+ >
+ mapService
+
+
+
+
-
- 更新时间：
- {{ helper.dateStringTransform(cellData.update_date) }}
+
-
+
+ 本月获取： + + {{ cellData.apply_num }} + + 次 +
-
@@ -76,94 +94,87 @@ export default {
-
\ No newline at end of file
diff --git a/src/components/service-list/commodity-list.vue b/src/components/service-list/commodity-list.vue
index e8531177650140494078f9e9f773f2b48991c9e9..e8238e6af0deedee2f0eef3bc01f7357ca8c1e3c 100644
--- a/src/components/service-list/commodity-list.vue
+++ b/src/components/service-list/commodity-list.vue
@@ -1,20 +1,20 @@
- 本月获取次数：
- {{ cellData.apply_num }}次
+ 查看详情
+
+
+
-
+
+
+ 服务类型：
+ {{ cellData.data_service_type1_name }}
+ {{ cellData.data_service_type2_name }} {{
+ cellData.data_service_type3_name
+ }}
+
+
+ 服务领域：
+ {{ cellData.sectors_name }}
+
+
+ 更新时间：
+ {{ helper.dateStringTransform(cellData.update_date) }}
+
+
+ {{ cellData.descript }} +
+
-
@@ -128,30 +127,11 @@ export default {
refreshData() {
this.$emit("refresh", this.pagination);
},
- pageResize() {
- let listWidth = this.$refs.commodityCardIn.clientWidth;
- let rowCardNum = Math.floor(listWidth / 310);
- let cardArr = this.$refs.commodityCardIn.children;
- // console.log(rowCardNum, listWidth / rowCardNum);
- for (let i = 0; i < cardArr.length; i++) {
- cardArr[i].style.width = listWidth / rowCardNum - 1 + "px";
- }
- // console.log(this.$refs.commodityCardIn);
- },
},
mounted() {},
watch: {
datas: {
- handler(val) {
- if (this.urlFilter == "app") {
- setTimeout(() => {
- this.pageResize();
- window.onresize = () => {
- this.pageResize();
- };
- }, 0);
- }
- },
+ handler(val) {},
},
url: {
handler() {
@@ -194,6 +174,9 @@ export default {
align-items: center;
}
.commodity_card {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
}
.commodity_card_list {
width: 100%;
@@ -206,6 +189,11 @@ export default {
.commodity_card_item_in {
margin: 0 auto;
}
+.commodity_cell {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+}
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue
index 8fa0e6a6a83b54fb17b35dce46a19b3de279c4af..ec68245b4f71379abc8b8ed9f2679d5f8a76988a 100644
--- a/src/components/shop-cloud/shop-cloud.vue
+++ b/src/components/shop-cloud/shop-cloud.vue
@@ -1,10 +1,10 @@
-
-
@@ -46,18 +46,17 @@
@click="handleCurrentChange(-1)"
:disabled="pagination.page == 1"
>
- 第{{ pagination.page }}页 / 共{{
- Math.ceil((total == 0 ? 1 : total) / pagination.rowsPerPage)
- }}页
+ 第{{ pagination.page }}页 / 共
+ {{ Math.ceil((total == 0 ? 1 : total) / pagination.rowsPerPage) }}页
-
+
-
-
+
-
+
服务超市
{{ name }}
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
申请组织：
部门联系人：
联系电话：
基本信息
- 工作区域名称：
- 中文名称：
- 描述信息：
- 工作区域申请规格
- CPU：
- 核
- 内存：
- GB
- 容器组：
- 个
- 数据盘（可选）：
- 块
- GB
- 单个容器组规格
- CPU：
- 内存：
- 最高
- 核
- 默认
- 核
- 最高
- GB
- 默认
- GB
- 其他信息
- 申请时长：
- 月
- 申请文件：
- 月
+
+
+ 申请文件：
+ 选择要进行调整的工作区域：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
工作区域规格调整
- 当前规格：
-
-
-
- ![]()
-
- {{ item.title }}
-
-
- {{
- item.val +
- " " +
- (item.title == "CPU"
- ? "核"
- : item.title == "内存"
- ? "GB"
- : "个")
- }}
-
-
- 申请CPU调整为：
- 核
- 申请内存调整为：
- GB
- 申请容器组调整为：
- 个
- 调整数据盘：
- 增加数据盘：
-
- 块
- GB
- 单个容器组规格设定
- 当前规格：
-
-
+
+
+
+
+
+
+
+
+
+
+
- ![]()
-
- {{ item.title }}
-
-
+
+
+
-
- 最高 {{ item.max }} {{
- item.title == "CPU" ? "核" : "GB"
- }}
-
-
- - 默认 {{ item.default }} {{ - item.title == "CPU" ? "核" : "GB" - }} - -
- - - 默认 {{ item.default }} {{ - item.title == "CPU" ? "核" : "GB" - }} - -
块
+ GB
+ 单个容器组规格设定
+ 当前规格：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -918,7 +891,9 @@
+ ![]()
+
+ {{ item.title }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 最高 {{ item.max }} {{
+ item.title == "CPU" ? "核" : "GB"
+ }}
+
+
+
+ 默认 {{ item.default }} {{
+ item.title == "CPU" ? "核" : "GB"
+ }}
+
-
- CPU：
- 内存：
- 最高
- 核
- 默认
- 核
- 最高
- GB
- CPU：
+ 最高
+ 核
+ 默认
+ 核
+ 内存：
+ 最高
+ GB
+ 默认
+ GB
+ 其他信息
+ 当前规格：
+
+
+
+ ![]()
+ 当前工作区域到期时间
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{
+ helper.dateStringTransform(paramsOld.cloud_end_time)
+ }}
+
+
+ 默认
- GB
-
-
- 其他信息
- 当前规格：
-
-
-
- ![]()
- 当前工作区域到期时间
-
- {{
- helper.dateStringTransform(
- paramsOld.cloud_end_time
- )
- }}
-
-
- 申请续期：
- 申请文件：
- 申请续期：
+ 月
+ 申请文件：
+
内存：
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index 0c4afee2900dd677f7c0aa1625582748b376d7bf..da4307e274c4e5b905ce397e9ec5419b13f167a4 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -2,14 +2,10 @@
- {{
- $t("lang.data_analysis")
- }}
+ {{ $t("lang.data_analysis") }}
- {{
- $t("lang.service_data_analysis")
- }}
+ {{ $t("lang.service_data_analysis") }}
@@ -17,14 +13,26 @@
-
+
@@ -41,14 +49,14 @@
class="block-radius-content"
:data="mult_data_state"
:show_center_data="false"
- :bar_width="10 "
+ :bar_width="10"
>
@@ -60,7 +68,11 @@
@changeButton="changeServiceTypeBtn"
class="block"
>
-
@@ -84,7 +96,11 @@
-
+
- om=[] + + 最高 {{ diaForm.perRAMs }}GB + 默认 {{ diaForm.perRAM }}GB @@ -1322,11 +1297,7 @@ export default { { value: "8", label: "8" }, { value: "16", label: "16" }, ], - optionsRAM: [ - { value: "8", label: "8" }, - { value: "16", label: "16" }, - { value: "32", label: "32" }, - ], + optionsRAM: [], options_store_type: [ { value: "nfs-client", label: "nfs-client" }, { value: "rook-ceph-block", label: "rook-ceph-block" }, @@ -1851,8 +1822,9 @@ export default { } .form_title { font-size: 16px; + line-height: 16px; font-weight: bold; - margin: 10px 0; + margin: 32px 0 24px; padding: 0 0 0 15px; position: relative; color: #58617a; @@ -1865,14 +1837,22 @@ export default { background-color: #515fe7; border-radius: 2px; left: 0; - top: 2px; + top: -1px; } .form_item { - width: calc(100% - 20px); + width: calc(100%); } .form_item_title { - padding: 0 15px; - line-height: 40px; + margin: 0 0 12px; + line-height: 14px; + font-size: 14px; + color: #58617a; +} +.form_item_title_1 { + margin: 0; + line-height: 14px; + font-size: 14px; + color: #58617a; } .input_has_right { position: relative; @@ -1885,7 +1865,7 @@ export default { background-color: #edeef4; border: 1px #e3e5ef solid; color: #8890a7; - border-radius: 0 8px 8px 0; + border-radius: 0 6px 6px 0; position: absolute; right: 0; } @@ -1900,7 +1880,7 @@ export default { background-color: #edeef4; border: 1px #e3e5ef solid; color: #8890a7; - border-radius: 8px 0 0 8px; + border-radius: 6px 0 0 6px; position: absolute; left: 0; } @@ -1912,26 +1892,28 @@ export default { right: 0; } .select_title { - padding: 20px 15px; + padding: 32px 0 12px; font-size: 16px; + line-height: 16px; font-weight: bold; - color: #242c43; + color: #58617a; } .now_spec { - padding: 10px 15px; + padding: 0 0 12px; } .now_spec_cards { + margin-bottom: 24px; } .now_spec_card { display: inline-block; - width: 165px; - height: 50px; + width: 194px; + height: 40px; background-color: #f7f8f9; - border-radius: 8px; - line-height: 50px; + border-radius: 6px; + line-height: 40px; padding: 0 20px; position: relative; - margin-right: 20px; + margin-right: 24px; } .now_spec_card_title { color: #6573ae; @@ -1945,15 +1927,15 @@ export default { } .now_spec_card_img { position: relative; - top: 2px; + top: 1px; } .now_rqz_card { display: inline-block; - width: 193px; - height: 78px; + width: 304px; + height: 40px; background-color: #f7f8f9; - border-radius: 8px; - line-height: 78px; + border-radius: 6px; + line-height: 40px; padding: 0 20px; position: relative; margin-right: 20px; @@ -1965,28 +1947,29 @@ export default { .now_rqz_card_val_div { color: #0d1847; position: absolute; - line-height: 30px; + line-height: 40px; right: 20px; - top: 9px; + top: 0; } .now_rqz_card_val { } .now_rqz_card_img { position: relative; - top: 2px; + top: 1px; } .now_spec_card_time { width: 381px; - height: 50px; + height: 40px; background-color: #f7f8f9; - border-radius: 8px; - line-height: 50px; + border-radius: 6px; + line-height: 40px; padding: 0 20px; position: relative; + margin-bottom: 24px; } .now_spec_card_time_img { position: relative; - top: 2px; + top: 1px; } .now_spec_card_time_title { color: #6573ae; @@ -2072,7 +2055,7 @@ export default { margin-right: 20px; } .doc_template { - margin: 0 0 10px 20px; + margin: 0 0 12px; } .up_f { width: calc(50% - 10px); @@ -2206,6 +2189,9 @@ export default { .clear_xxx { clear: both; } +.disk__table { + margin-bottom: 0; +} diff --git a/src/pages/authority/organization/organization.vue b/src/pages/authority/organization/organization.vue index 2e296125fcb615fb288d43a82455cd5199e9c2bc..044fcdd80abf0153a8b15830b540455378ae8a83 100644 --- a/src/pages/authority/organization/organization.vue +++ b/src/pages/authority/organization/organization.vue @@ -2,6 +2,8 @@
- ![]()
+ ![]()
- 服务总数
{{ overview.serviceTotal }}
@@ -92,20 +108,36 @@
+
+
-
@@ -229,7 +289,7 @@
class="block-radius-content"
:options="starlistData"
:total="starlistTotal"
- style="margin-top: 30px;height: calc(100% - 51px);"
+ style="margin-top: 30px; height: calc(100% - 51px)"
>
@@ -237,13 +297,24 @@
-
-
+
- ![]()
+ ![]()
@@ -291,7 +362,12 @@ export default {
right_2_state: 0,
right_3_state: 0,
last_id: 0,
- mult_data_state: [],
+ mult_data_state: [
+ { name: "健康", value: 0 },
+ { name: "未使用", value: 0 },
+ { name: "故障", value: 0 },
+ { name: "警告", value: 0 },
+ ],
mult_data: [],
spIndicatorStyles1: false,
spRefLineStyles3: {
@@ -547,7 +623,25 @@ export default {
getServiceHealth() {
this.$api.dataAnalysis.getServiceHealth().then((response) => {
if (response.data.success == 1) {
- this.mult_data_state = response.data.data.seriesData;
+ let data = response.data.data.seriesData;
+ let jk = data.find((item) => {
+ return item.name == "健康";
+ });
+ let wsy = data.find((item) => {
+ return item.name == "未使用";
+ });
+ let gz = data.find((item) => {
+ return item.name == "故障";
+ });
+ let jg = data.find((item) => {
+ return item.name == "警告";
+ });
+ this.mult_data_state = [
+ { name: "健康", value: jk.value },
+ { name: "未使用", value: wsy.value },
+ { name: "故障", value: gz.value },
+ { name: "警告", value: jg.value },
+ ];
}
});
},
diff --git a/src/pages/data-analysis/org-service.vue b/src/pages/data-analysis/org-service.vue
index 404ed72fe44db56500a95f048a543a300e01a922..4726d33a53550388a38f4748cb12ab29e888a272 100644
--- a/src/pages/data-analysis/org-service.vue
+++ b/src/pages/data-analysis/org-service.vue
@@ -315,10 +315,10 @@ export default {
right_3_state: 0,
last_id: 0,
mult_data_state: [
- { name: "正常", value: 0 },
- { name: "警告", value: 0 },
- { name: "错误", value: 0 },
+ { name: "健康", value: 0 },
{ name: "未使用", value: 0 },
+ { name: "故障", value: 0 },
+ { name: "警告", value: 0 },
],
mult_data: [
{ name: "数据服务", value: 0 },
@@ -535,7 +535,25 @@ export default {
getServiceHealth() {
this.$api.dataAnalysis.getServiceHealth().then((response) => {
if (response.data.success == 1) {
- this.mult_data_state = response.data.data.seriesData;
+ let data = response.data.data.seriesData;
+ let jk = data.find((item) => {
+ return item.name == "健康";
+ });
+ let wsy = data.find((item) => {
+ return item.name == "未使用";
+ });
+ let gz = data.find((item) => {
+ return item.name == "故障";
+ });
+ let jg = data.find((item) => {
+ return item.name == "警告";
+ });
+ this.mult_data_state = [
+ { name: "健康", value: jk.value },
+ { name: "未使用", value: wsy.value },
+ { name: "故障", value: gz.value },
+ { name: "警告", value: jg.value },
+ ];
}
});
},
diff --git a/src/pages/data-analysis/super-service.vue b/src/pages/data-analysis/super-service.vue
index eeb050685305410bdf3bfb78a925319d31cbf3c4..111a25dc385f821dc529e5dc8f1dfbb45dc84c13 100644
--- a/src/pages/data-analysis/super-service.vue
+++ b/src/pages/data-analysis/super-service.vue
@@ -309,10 +309,10 @@ export default {
right_3_state: 0,
last_id: 0,
mult_data_state: [
- { name: "正常", value: 0 },
- { name: "警告", value: 0 },
- { name: "错误", value: 0 },
+ { name: "健康", value: 0 },
{ name: "未使用", value: 0 },
+ { name: "故障", value: 0 },
+ { name: "警告", value: 0 },
],
mult_data: [
{ name: "数据服务", value: 0 },
@@ -529,7 +529,25 @@ export default {
getServiceHealth() {
this.$api.dataAnalysis.getServiceHealth().then((response) => {
if (response.data.success == 1) {
- this.mult_data_state = response.data.data.seriesData;
+ let data = response.data.data.seriesData;
+ let jk = data.find((item) => {
+ return item.name == "健康";
+ });
+ let wsy = data.find((item) => {
+ return item.name == "未使用";
+ });
+ let gz = data.find((item) => {
+ return item.name == "故障";
+ });
+ let jg = data.find((item) => {
+ return item.name == "警告";
+ });
+ this.mult_data_state = [
+ { name: "健康", value: jk.value },
+ { name: "未使用", value: wsy.value },
+ { name: "故障", value: gz.value },
+ { name: "警告", value: jg.value },
+ ];
}
});
},
diff --git a/src/pages/service_shop/shop_cloud.vue b/src/pages/service_shop/shop_cloud.vue
index 7eb2afdf37136b32246e8b15ee54340bdef4a42d..3533b7fbb07eb723f28545e4e21bd6a101355295 100644
--- a/src/pages/service_shop/shop_cloud.vue
+++ b/src/pages/service_shop/shop_cloud.vue
@@ -1,10 +1,10 @@
- 下一步
+ 下一步
+
- {{sparkline1.num}}
+ {{ sparkline1.num }}
- {{sparkline1.up>0?sparkline1.up:0-sparkline1.up}}%
+ {{
+ sparkline1.up > 0
+ ? sparkline1.up
+ : 0 - sparkline1.up
+ }}%
- 
+
- {{sparkline2.num}}
+ {{ sparkline2.num }}
- {{sparkline2.up>0?sparkline2.up:0-sparkline2.up}}%
+ {{
+ sparkline2.up > 0
+ ? sparkline2.up
+ : 0 - sparkline2.up
+ }}%
-
+
+
-
+
-
+
@@ -25,4 +25,12 @@ export default {
};
\ No newline at end of file
diff --git a/src/pages/service_shop/shop_list.vue b/src/pages/service_shop/shop_list.vue
index 369e9ec8af37a03f8fbc7ad5a5f7d0dc8ddc4ca9..c87d0ed1b3deb28afeb30a002e85408b0671f393 100644
--- a/src/pages/service_shop/shop_list.vue
+++ b/src/pages/service_shop/shop_list.vue
@@ -1,10 +1,10 @@
-
@@ -116,18 +153,17 @@ export default {
data() {
return {
use_approval_arr: [],
- process_in_up:false,//是否是服务注册产生的
- perception_in:false,//是否是感知服务
- service_apply_type:1,//服务申请的方式，1：计次收费2：时长收费
- port_select:'',
- req_solt_code_arr:'',
- res_solt_code_arr:'',
- perception_req_solt_code_arr:'',
- perception_res_solt_code_arr:'',
- req_solt_data:[],
- res_solt_data:[],
- perception_req_solt_data:[],
- perception_res_solt_data:[],
+ process_in_up: false, //是否是服务注册产生的
+ perception_in: false, //是否是感知服务
+ port_select: "",
+ req_solt_code_arr: "",
+ res_solt_code_arr: "",
+ perception_req_solt_code_arr: "",
+ perception_res_solt_code_arr: "",
+ req_solt_data: [],
+ res_solt_data: [],
+ perception_req_solt_data: [],
+ perception_res_solt_data: [],
req_solt_header_arr: [
{
prop: "name",
@@ -189,7 +225,7 @@ export default {
align: "center",
width: 240,
},
- ],
+ ],
perception_req_solt_header_arr: [
{
prop: "name",
@@ -225,7 +261,7 @@ export default {
align: "center",
width: 240,
},
- ],
+ ],
perception_res_solt_header_arr: [
{
prop: "name",
@@ -261,9 +297,9 @@ export default {
align: "center",
width: 240,
},
- ],
- port_options:[],
- port_solt_arr:[
+ ],
+ port_options: [],
+ port_solt_arr: [
{
title: "服务地址：",
info: "",
@@ -301,7 +337,7 @@ export default {
solt_name: "response_code",
},
],
- perception_solt_arr:[
+ perception_solt_arr: [
{
title: "接口文档：",
info: "",
@@ -339,9 +375,9 @@ export default {
info: "",
type: "solt",
solt_name: "response_code",
- }
+ },
],
- process_in_up_arr:[
+ process_in_up_arr: [
{
title: "接口文档：",
info: "",
@@ -353,7 +389,7 @@ export default {
info: "",
type: "solt",
solt_name: "service_port",
- }
+ },
],
approval_arr: [
{
@@ -477,7 +513,7 @@ export default {
service_header_arr: {
id: "",
isMap: false,
- isProcess:false,
+ isProcess: false,
name: "",
first: [
{
@@ -493,6 +529,10 @@ export default {
name: "服务到期时间",
text: "",
},
+ {
+ name: "可用调用次数",
+ text: "",
+ },
],
second: [
{
@@ -652,7 +692,7 @@ export default {
},
], // 响应参数-header
res_table_arr: [], // 响应参数
- res_code_arr: ""
+ res_code_arr: "",
};
},
watch: {},
@@ -662,16 +702,16 @@ export default {
},
mounted() {},
methods: {
- change_port(val){
- this.port_options.forEach(e => {
- if(e.value == val){
- this.$set(this.port_solt_arr[0],'info',e.value)
- this.$set(this.port_solt_arr[1],'info',e.req_type)
- this.$set(this.port_solt_arr[2],'info',e.encode_method)
- this.req_solt_data = e.req_fields
- this.res_solt_data = e.res_fields
- this.req_solt_code_arr = e.req_fields_example
- this.res_solt_code_arr = e.res_fields_example
+ change_port(val) {
+ this.port_options.forEach((e) => {
+ if (e.value == val) {
+ this.$set(this.port_solt_arr[0], "info", e.value);
+ this.$set(this.port_solt_arr[1], "info", e.req_type);
+ this.$set(this.port_solt_arr[2], "info", e.encode_method);
+ this.req_solt_data = e.req_fields;
+ this.res_solt_data = e.res_fields;
+ this.req_solt_code_arr = e.req_fields_example;
+ this.res_solt_code_arr = e.res_fields_example;
}
});
},
@@ -726,79 +766,108 @@ export default {
? "#515fe7"
: "#e15260"
);
-
- this.$set(this.service_header_arr["second"][0], "text", data.service_apply_info.urls[0].req_url);
+
+ this.$set(
+ this.service_header_arr["second"][0],
+ "text",
+ data.service_apply_info.urls[0].req_url
+ );
this.$set(this.service_header_arr, "url", data.cover);
//判断是否是服务注册出来的流程服务
- if(data.data_service_type2 == 24&&data.workflows_id==0){
- this.process_in_up = true
- this.$set(this.process_in_up_arr[0],'info',data.doc_file.split('/')[data.doc_file.split('/').length-1])
- this.$set(this.process_in_up_arr[0],'url',data.doc_file)
- var temp_port_arr = []
- data.urls.forEach(e => {
- temp_port_arr.push({
- label:e.req_name,
- value:e.req_url,
- able:e.state==-1?false:true,
- ...e
- })
+ if (data.data_service_type2 == 24 && data.workflows_id == 0) {
+ this.process_in_up = true;
+ this.$set(
+ this.process_in_up_arr[0],
+ "info",
+ data.doc_file.split("/")[data.doc_file.split("/").length - 1]
+ );
+ this.$set(this.process_in_up_arr[0], "url", data.doc_file);
+ var temp_port_arr = [];
+ data.urls.forEach((e) => {
+ temp_port_arr.push({
+ label: e.req_name,
+ value: e.req_url,
+ able: e.state == -1 ? false : true,
+ ...e,
});
- this.port_options = temp_port_arr
- if(this.port_options[0]){
- this.port_select = this.port_options[0].value
- this.$set(this.port_solt_arr[0],'info',this.port_options[0].value)
- this.$set(this.port_solt_arr[1],'info',this.port_options[0].req_type)
- this.$set(this.port_solt_arr[2],'info',this.port_options[0].encode_method)
- this.req_solt_data = this.port_options[0].req_fields
- this.res_solt_data = this.port_options[0].res_fields
- this.req_solt_code_arr = this.port_options[0].req_fields_example
- this.res_solt_code_arr = this.port_options[0].res_fields_example
- }
- }else{
- this.process_in_up = false
- }
-
- if(data.service_data_type_1 == 10){
- this.perception_in = true
- this.$set(this.perception_solt_arr[0],'info',data.doc_file.split('/')[data.doc_file.split('/').length-1])
- this.$set(this.perception_solt_arr[1],'info',data.urls[0].req_url)
- this.$set(this.perception_solt_arr[2],'info',data.urls[0].encode_method)
- this.req_solt_data = data.urls[0].req_fields
- this.res_solt_data = data.urls[0].res_fields
- this.req_solt_code_arr = data.urls[0].req_fields_example
- this.res_solt_code_arr = data.urls[0].res_fields_example
- }else{
- this.perception_in = false
- }
-
- if(this.service_apply_type==1){
+ });
+ this.port_options = temp_port_arr;
+ if (this.port_options[0]) {
+ this.port_select = this.port_options[0].value;
this.$set(
- this.service_header_arr["first"][2],
- "text",
- data.service_apply_info.service_end_time == "0001-01-01T00:00:00Z"
- ? "-"
- : data.service_apply_info.service_end_time
- .replace("T", " ")
- .split("+")[0]
+ this.port_solt_arr[0],
+ "info",
+ this.port_options[0].value
);
- this.$set(this.service_header_arr["first"][2],'name','可调用次数')
- }else{
this.$set(
- this.service_header_arr["first"][2],
- "text",
- data.service_apply_info.service_end_time == "0001-01-01T00:00:00Z"
- ? "-"
- : data.service_apply_info.service_end_time
- .replace("T", " ")
- .split("+")[0]
+ this.port_solt_arr[1],
+ "info",
+ this.port_options[0].req_type
);
+ this.$set(
+ this.port_solt_arr[2],
+ "info",
+ this.port_options[0].encode_method
+ );
+ this.req_solt_data = this.port_options[0].req_fields;
+ this.res_solt_data = this.port_options[0].res_fields;
+ this.req_solt_code_arr = this.port_options[0].req_fields_example;
+ this.res_solt_code_arr = this.port_options[0].res_fields_example;
}
- if(this.process_in_up){
- var temp_sj = this.service_header_arr.first.pop()
- this.service_header_arr.second = []
- this.service_header_arr.second.push(temp_sj)
- }
+ } else {
+ this.process_in_up = false;
+ }
+
+ if (data.service_data_type_1 == 10) {
+ this.perception_in = true;
+ this.$set(
+ this.perception_solt_arr[0],
+ "info",
+ data.doc_file.split("/")[data.doc_file.split("/").length - 1]
+ );
+ this.$set(
+ this.perception_solt_arr[1],
+ "info",
+ data.urls[0].req_url
+ );
+ this.$set(
+ this.perception_solt_arr[2],
+ "info",
+ data.urls[0].encode_method
+ );
+ this.req_solt_data = data.urls[0].req_fields;
+ this.res_solt_data = data.urls[0].res_fields;
+ this.req_solt_code_arr = data.urls[0].req_fields_example;
+ this.res_solt_code_arr = data.urls[0].res_fields_example;
+ } else {
+ this.perception_in = false;
+ }
+
+ if (data.service_apply_info.spcs_type == 1) {
+ this.$set(this.service_header_arr["first"][2], "text", "不限时长");
+
+ this.$set(
+ this.service_header_arr["first"][3],
+ "text",
+ data.service_apply_info.spcs_count
+ );
+ } else {
+ this.$set(
+ this.service_header_arr["first"][2],
+ "text",
+ data.service_apply_info.service_end_time
+ .replace(/T|Z/g, " ")
+ .split("+")[0]
+ );
+
+ this.$set(this.service_header_arr["first"][3], "text", "不限次数");
+ }
+ if (this.process_in_up) {
+ var temp_sj = this.service_header_arr.first.pop();
+ this.service_header_arr.second = [];
+ this.service_header_arr.second.push(temp_sj);
+ }
this.$set(this.list_arr[0], "info", data.descript);
this.$set(this.list_arr[1], "info", data.data_service_type2_name);
this.$set(
@@ -857,16 +926,17 @@ export default {
"url",
data.service_apply_info.apply_file
);
- this.$set(
- this.apply_arr[6],
- "info",
- "访问次数：" +
- data.service_apply_info.request_spcs.pv +
- "/日，" +
- "访问量：" +
- data.service_apply_info.request_spcs.count +
- "/日"
- );
+
+ let spcs = "";
+ if (data.service_apply_info.spcs_type === 1) {
+ spcs = `${data.service_apply_info.single_money}金币/${data.service_apply_info.spcs_count}次`;
+ } else {
+ spcs = `${data.service_apply_info.single_money}金币/${
+ data.service_apply_info.duration_unit == 1 ? "月" : "年"
+ }`;
+ }
+ this.$set(this.apply_arr[6], "info", spcs);
+
this.$set(
this.apply_arr[7],
"info",
@@ -876,7 +946,9 @@ export default {
this.$set(
this.apply_arr[8],
"info",
- data.service_apply_info.apply_time.replace("T", " ").split("+")[0]
+ data.service_apply_info.apply_time
+ .replace(/T|Z/g, " ")
+ .split("+")[0]
);
this.$set(
this.apply_arr[9],
@@ -938,7 +1010,7 @@ export default {
}
this.res_data = JSON.parse(data.res_fields);
})
- .catch(function (response) {});
+ .catch(function(response) {});
},
},
};
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index b7626cf4dee6ec944b0b348d1faa9b1b0838736f..628801c74c33eb700bbe111444dc1434de7329c8 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -417,14 +417,16 @@
class="reset"
v-if="activeBtn == 0 && resSuccess"
@click="resetSjfw"
- >重置
+ 重置
+
+
-
+
-
+
\ No newline at end of file
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 78466c422110934bbc72333813f636a188be51b1..13032e02c105636dd6706f3eecd2bbae39e8ddfe 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -103,7 +103,7 @@ export default {
name: "请求参数",
type: "table",
value: {
- datas: this.getTableData(datas.req_fields),
+ datas: this.getTableData(datas.req_query),
columns: [
{
prop: "name",
diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue
index ead5ccfa65646d466962ebb4bf13e991b331128e..b83905f7bb0def015d43e4ba171a200ffbe34d28 100644
--- a/src/pages/service_shop/skfwDetail.vue
+++ b/src/pages/service_shop/skfwDetail.vue
@@ -14,7 +14,6 @@
({
baseInfo: null,
detailData: null,
- specificationData: null,
providerData: null,
commentsData: null,
}),
@@ -61,17 +59,6 @@ export default {
})
.then(({ data }) => {
let datas = data.data;
- let specificationData =
- (datas.serviceRequestSpcs &&
- datas.serviceRequestSpcs.map((item) => ({
- id: item.id,
- type: item.type,
- pv: item.pv,
- count: item.count,
- name: `访问次数：${item.pv}次/日 访问量：${item.count}次/日`,
- descript: item.des,
- }))) ||
- [];
this.baseInfo = {
portal_id: datas.portal_id || "", // 时空服务id
@@ -93,9 +80,9 @@ export default {
datas.data_service_type3_name,
],
descript: datas.descript,
- serviceRequestSpcs: specificationData,
scoreDetail: datas.scoreDetail,
month_sale: data.month_sale,
+ serviceRequestSpcs: datas.serviceRequestSpcs,
};
this.detailData = [
@@ -145,7 +132,6 @@ export default {
],
}, */
];
- this.specificationData = specificationData;
this.providerData = {
organization_name: datas.organization_name,
picture_path: datas.organization_picture,
diff --git a/src/pages/service_shop/zhfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue
index dc0a036846e346b9765971399a98034ce4502e63..575ada852fc7401543780479c1ebbbe3823f249a 100644
--- a/src/pages/service_shop/zhfwDetail.vue
+++ b/src/pages/service_shop/zhfwDetail.vue
@@ -14,7 +14,6 @@
({
baseInfo: null,
detailData: null,
- specificationData: null,
providerData: null,
commentsData: null,
}),
@@ -56,18 +54,6 @@ export default {
})
.then(({ data }) => {
let datas = data.data;
- let specificationData =
- (datas.serviceRequestSpcs &&
- datas.serviceRequestSpcs.map((item) => ({
- id: item.id,
- type: item.type,
- pv: item.pv,
- count: item.count,
- name: `访问次数：${item.pv}次/日 访问量：${item.count}次/日`,
- descript: item.des,
- }))) ||
- [];
-
this.baseInfo = {
service_id: this.id,
app_id: 0,
@@ -88,7 +74,7 @@ export default {
datas.data_service_type3_name,
],
descript: datas.descript,
- serviceRequestSpcs: specificationData,
+ serviceRequestSpcs: datas.serviceRequestSpcs,
scoreDetail: datas.scoreDetail,
month_sale: data.month_sale,
};
@@ -141,7 +127,6 @@ export default {
value: datas.workflows_id,
});
}
- this.specificationData = specificationData;
this.providerData = {
organization_name: datas.organization_name,
picture_path: datas.organization_picture,
diff --git a/src/pages/workbench/component-center/process-management/designer/index.vue b/src/pages/workbench/component-center/process-management/designer/index.vue
index 49b604fb9a51903bcb92d01b54409d12311b244a..513b835d0e627de66bb31a4a174f8d4146831c4a 100644
--- a/src/pages/workbench/component-center/process-management/designer/index.vue
+++ b/src/pages/workbench/component-center/process-management/designer/index.vue
@@ -176,7 +176,7 @@ export default {
{
label: "流程编号",
prop: "workflows_code",
- width: 180,
+ width: 130,
},
{
label: "流程名称",
@@ -188,7 +188,7 @@ export default {
label: "服务领域",
prop: "sector_name",
align: "center",
- width: 240,
+ width: 200,
},
{
label: "创建时间",
@@ -206,7 +206,7 @@ export default {
return ["未部署", "已部署", "已发布"][item.state || 0];
},
align: "center",
- width: 180,
+ width: 80,
},
{
label: "工作区域",
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index d370dca1148afaf691045c59a4c062c2cb485abd..51d68094d559d78bafd88b26ab7870c9a24c77a3 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -16,20 +16,33 @@
:style="
now_service == index ? { borderBottom: '4px solid #f5ab4c' } : {}
"
- >{{ item }}
+ >
+ {{ item }}
+
-
+
-
+
+ :value="item.value"
+ >
-
+
-
-
-
+
-
@@ -1058,6 +1060,7 @@ export default {
this.jkwds = [];
},
getUrl(enUrl) {
+ enUrl = enUrl.replace(/\s*/g, "");
let url = decodeURI(enUrl);
let arr = [];
if (url.indexOf("?") != -1) {
@@ -1227,21 +1230,31 @@ export default {
if (this.jkwds.length == 0) {
this.$message.error("请上传接口文档");
} else {
- let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
- let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
- this.requestRules = 0;
- this.responseRules = 0;
- this.checkTable(requestData, 0);
- this.checkTable(responseData, 1);
- if (this.requestRules == 0 && this.responseRules == 0) {
- this.request_fields = requestData;
- this.response_fields = responseData;
+ if (
+ this.activeBtn == 2 ||
+ (this.activeBtn == 4 && this.zhyyVal == 22)
+ ) {
+ this.request_fields = [];
+ this.response_fields = [];
this.jcxxtx = true;
this.getOrganization();
- } else if (this.requestRules != 0) {
- this.$message.error("请完善请求参数信息中的字段名称");
- } else if (this.responseRules != 0) {
- this.$message.error("请完善返回参数信息中的字段名称");
+ } else {
+ let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
+ let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
+ this.requestRules = 0;
+ this.responseRules = 0;
+ this.checkTable(requestData, 0);
+ this.checkTable(responseData, 1);
+ if (this.requestRules == 0 && this.responseRules == 0) {
+ this.request_fields = requestData;
+ this.response_fields = responseData;
+ this.jcxxtx = true;
+ this.getOrganization();
+ } else if (this.requestRules != 0) {
+ this.$message.error("请完善请求参数信息中的字段名称");
+ } else if (this.responseRules != 0) {
+ this.$message.error("请完善返回参数信息中的字段名称");
+ }
}
}
} else {
@@ -1343,13 +1356,22 @@ export default {
data_service_type1: 6,
data_service_type2: this.skfwQqt,
encode_method: this.form.code,
- method: "GET",
- url: this.serviceUrl,
- request_fields: [],
- request_query_fields: [],
- response_fields: [],
- content_type: "json",
portal_id: this.portal_id,
+ doc_file: "",
+ urls: [
+ {
+ name: "",
+ response_type: "JSON",
+ req_auth_mthod: 0,
+ req_auth_token: "",
+ method: "GET",
+ url: this.serviceUrl,
+ request_fields: [],
+ request_query_fields: [],
+ response_fields: [],
+ content_type: "JSON",
+ },
+ ],
};
} else if (this.is_map == 4) {
query = {
@@ -1362,13 +1384,21 @@ export default {
data_service_type1: 21,
data_service_type2: 34,
encode_method: this.form.code,
- method: "GET",
- url: this.serviceUrl,
- request_fields: [],
- request_query_fields: [],
- response_fields: [],
- content_type: "json",
portal_id: this.portal_id,
+ urls: [
+ {
+ name: "",
+ response_type: "JSON",
+ req_auth_mthod: 0,
+ req_auth_token: "",
+ method: "GET",
+ url: this.serviceUrl,
+ request_fields: [],
+ request_query_fields: [],
+ response_fields: [],
+ content_type: "JSON",
+ },
+ ],
};
}
this.$api.workbench.serviceAdd(query).then((response) => {
@@ -1429,7 +1459,10 @@ export default {
registePt() {
this.$refs.form.validate((valid) => {
if (valid) {
- if ((this.activeBtn == 2 && this.jkwds.length == 0) || (this.activeBtn == 3 && this.jkwds.length == 0)) {
+ if (
+ (this.activeBtn == 2 && this.jkwds.length == 0) ||
+ (this.activeBtn == 3 && this.jkwds.length == 0)
+ ) {
this.$message.error("请上传接口文档");
} else {
if (this.cover.length != 0) {
@@ -1437,7 +1470,11 @@ export default {
if (this.activeBtn == 1 && !this.is_portal) {
this.addPortalItem();
} else {
- if (this.activeBtn == 0 || this.activeBtn == 2 || this.activeBtn == 3) {
+ if (
+ this.activeBtn == 0 ||
+ this.activeBtn == 2 ||
+ this.activeBtn == 3
+ ) {
contentType = this.sjfwQqt;
} else if (this.activeBtn == 4) {
if (this.activeZh == "1") {
@@ -1840,6 +1877,7 @@ export default {
});
},
getUrlOne(enUrl, indexOne) {
+ enUrl = enUrl.replace(/\s*/g, "");
let url = decodeURI(enUrl);
let arr = [];
if (url.indexOf("?") != -1) {
diff --git a/src/router/index.js b/src/router/index.js
index f3425bee96bb05b40f21762aea45185b11265829..4f844dd0e1be681ff2a3e54cedbf284be8849111 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,9 @@ Router.prototype.push = function push(location, onResolve, onReject) {
};
export default new Router({
+ scrollBehavior (to, from, savedPosition) {
+ return { x: 0, y: 0 }
+ },
routes: [
{
path: "/",