-
+
+ {{ data.name }}
+
+ ( {{ data.version }} )
+
+
+
+
+
+
+
+
diff --git a/src/pages/service_shop/shop_car_apply.vue b/src/pages/service_shop/shop_car_apply.vue
index 847b8892cdfe3a937d812643f0e5ddf54f527831..3f541ba7687b074692f8a138d0bdd7a5f0f5ee7c 100644
--- a/src/pages/service_shop/shop_car_apply.vue
+++ b/src/pages/service_shop/shop_car_apply.vue
@@ -180,7 +180,7 @@ export default {
app_data.duration * parseFloat(data.price) + "金币";
this.service_arr[0]["isMg"] = false;
this.service_arr[0]["isapp"] = true;
- console.log(data, this.service_arr)
+ console.log(data, this.service_arr);
this.all_cost = app_data.duration * parseFloat(data.price);
}
});
@@ -216,7 +216,7 @@ export default {
objs.auth = data.organization_name;
objs.size = "";
objs.count = "";
- let request_spcs_info = data.request_spcs_info||[]
+ let request_spcs_info = data.request_spcs_info || [];
request_spcs_info.forEach((el) => {
if (service_data.spec_id == el.id) {
let size = "";
@@ -242,10 +242,12 @@ export default {
objs.applytype =
"申请方式：" + (service_data.duration_unit == 1 ? "月" : "年");
objs.isMg = data.openness == 3;
- objs.data = JSON.parse(data.res_fields);
+ if (data.data_service_type1 != 36) {
+ objs.data = JSON.parse(data.res_fields);
+ }
objs.isapp = false;
this.service_arr = [objs];
- console.log(this.service_arr);
+ console.log(objs, this.service_arr);
} else {
this.$message.error(response.data.errMsg);
}
@@ -456,7 +458,7 @@ export default {
this.service_arr[l]["isMg"] = e.service.openness == 3;
this.service_arr[l]["data"] = e.service.res_fields
? JSON.parse(e.service.res_fields)
- : "[]";
+ : [];
console.log(this.service_arr[l]["data"]);
this.service_arr[l]["isapp"] = false;
}
diff --git a/src/pages/service_shop/shop_list-new.vue b/src/pages/service_shop/shop_list-new.vue
index 231364c4f3fbba042fe2dad0e148169a486aca9e..adf51b27e1754a439039764f841a6a856c10359f 100644
--- a/src/pages/service_shop/shop_list-new.vue
+++ b/src/pages/service_shop/shop_list-new.vue
@@ -76,6 +76,12 @@ export default {
this.url = "/shop/yysdDetail";
this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
break;
+ case "products_list":
+ this.name = "产品资源";
+ this.urlFilter = "36";
+ this.url = "/shop/cpDetail";
+ this.filterNames = ["产品类型", "产品领域", "产品来源组织"];
+ break;
default:
this.name = "";
this.urlFilter = "";
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index c4b24f9b9fa85e4fc24f7493db39245861b5742f..4b1df1133f8121687d8eaec705a777aa6fbf8334 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -11,7 +11,7 @@
{
+ strtags += item + " ";
+ });
+ }
+ this.$set(this.cp_arr[2], "info", strtags);
+ this.$set(this.cp_arr[3], "info", data.organization_name);
+ this.$set(this.cp_arr[4], "info", data.openness_name);
+ this.$set(
+ this.cp_arr[5],
+ "info",
+ data.create_time == "0001-01-01T00:00:00Z"
+ ? "-"
+ : data.create_time
+ .replace("T", " ")
+ .replace("Z", "")
+ .split("+")[0]
+ );
+ this.data_service_type1 = data.data_service_type1;
+ if (this.data_service_type1 == "36") {
+ this.service_arr[0] = "产品基本信息";
+ this.service_arr[1] = "";
+ this.service_arr[2] = "申请审批信息";
+ this.getMd(data.doc_file);
+ }
this.$set(
this.servicead_arr[0],
"info",
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 6dc68e4190b60a0fd01ac7092e344324c5d3e8a5..39d6b3686fb927e388c117ca8983f6f3fbb1aaec 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -19,20 +19,32 @@
{{ item }}
+
流程服务接口说明见文档中心流程服务接口文档
-
-
+
+ :value="item.value"
+ >
-
+
+
- 服务运行概况
-
-
+
-
+
- 故障
-
- {{item.label}}
+ :value="item.value + ',' + item.able"
+ >
+ 故障
+
+ {{ item.label }}
@@ -117,13 +214,17 @@
+
-
@@ -332,9 +433,9 @@ export default {
data() {
return {
now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
- process_in_up:false,//是否是服务注册产生的流程服务
- perception_in:false,//是否是感知服务
- in_origin_ser:false,//是否是组织内部的服务
+ process_in_up: false, //是否是服务注册产生的流程服务
+ perception_in: false, //是否是感知服务
+ in_origin_ser: false, //是否是组织内部的服务
buy_style: [1],
// editstr:'+')
',
+ label:
+ '规格类型
',
width: "180px",
align: "center",
type: "select",
- selectArr:[
+ selectArr: [
{
- label:'计次收费规格',
- value:1
+ label: "计次收费规格",
+ value: 1,
},
{
- label:'时长收费规格',
- value:2
- }
- ]
+ label: "时长收费规格",
+ value: 2,
+ },
+ ],
},
{
prop: "money",
@@ -876,7 +992,10 @@ export default {
},
{
prop: "pv",
- label: '调用次数',
+ label:
+ '调用次数',
width: "150px",
align: "center",
type: "input",
@@ -891,14 +1010,14 @@ export default {
prop: "time",
label: "时长",
width: "150px",
- align: "left"
+ align: "left",
},
{
prop: "descript",
label: "规格说明",
minWidth: "33.33%",
align: "left",
- type:'input'
+ type: "input",
},
{
label: "操作",
@@ -949,7 +1068,7 @@ export default {
solt_name: "res_code",
},
],
- process_in_up_arr:[
+ process_in_up_arr: [
{
title: "接口文档：",
info: "",
@@ -961,9 +1080,9 @@ export default {
info: "",
type: "solt",
solt_name: "service_port",
- }
+ },
],
- port_solt_arr:[
+ port_solt_arr: [
{
title: "服务地址：",
info: "",
@@ -1001,7 +1120,7 @@ export default {
solt_name: "response_code",
},
],
- gz_solt_arr:[
+ gz_solt_arr: [
{
title: "请求方式：",
info: "12123",
@@ -1035,7 +1154,7 @@ export default {
solt_name: "response_code",
},
],
- port_options:[],
+ port_options: [],
service_type_arr: [
"数据服务",
"时空服务",
@@ -1084,6 +1203,38 @@ export default {
info: "",
},
],
+ cp_arr: [
+ {
+ title: "产品简介：",
+ info: "",
+ },
+ {
+ title: "产品领域：",
+ info: "",
+ },
+ {
+ title: "产品标签：",
+ info: "",
+ },
+ {
+ title: "所属组织：",
+ info: "",
+ },
+ {
+ title: "开放程度：",
+ info: "",
+ },
+ {
+ title: "注册发布时间：",
+ info: "",
+ },
+ {
+ title: "产品详情：",
+ type: "solt",
+ solt_name: "cp_md",
+ },
+ ],
+ data_service_type1: ""
};
},
computed: {
@@ -1095,15 +1246,15 @@ export default {
if (n == 2) {
this.getData();
}
- }
+ },
},
created() {
if (this.userInfo) {
this.now_user = this.level;
- if(this.now_user==1||this.now_user==2){
- this.in_origin_ser = true
- }else{
- this.in_origin_ser = false
+ if (this.now_user == 1 || this.now_user == 2) {
+ this.in_origin_ser = true;
+ } else {
+ this.in_origin_ser = false;
}
} else {
this.getCurrentUser();
@@ -1114,16 +1265,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;
}
});
},
@@ -1135,7 +1286,7 @@ export default {
transchangePageSize(value) {
this.transpageSize = value;
this.transcurrentPage = 1;
- this.get_trans_data()
+ this.get_trans_data();
},
changeCurrentPage(value) {
this.currentPage = value;
@@ -1143,33 +1294,35 @@ export default {
},
transchangeCurrentPage(value) {
this.transcurrentPage = value;
- this.get_trans_data()
+ this.get_trans_data();
},
- iconChange (val) {
+ iconChange(val) {
// el-select实际上是两层div包裹的input
this.port_select_server = val;
// 获取当前el-select标签第一层div
- const dom = this.$refs['select_icon'].$el;
- if(dom.children[0].children[0].tagName == 'SPAN'){
- dom.children[0].children[0].remove()
+ const dom = this.$refs["select_icon"].$el;
+ if (dom.children[0].children[0].tagName == "SPAN") {
+ dom.children[0].children[0].remove();
}
// 创建需要添加到其中的标签 并填充内容
- const svgDom = document.createElement('span'); // ('![]()
![]()
{{ item.name }}
@@ -112,10 +112,16 @@
XML
- {{ yx_state.state }}
@@ -132,7 +233,7 @@
+
@@ -140,7 +241,7 @@
-
-
+
{{ yx_state.averageTime }}
最大响应时间：{{ yx_state.maxTime }}
+
@@ -149,7 +250,7 @@
{{ yx_state.averageTraffic }}
最大吞吐率：{{ yx_state.maxTraffic }}
{{ yx_state.memory }}
@@ -163,7 +264,7 @@服务调用列表
-
@@ -299,7 +400,7 @@
服务规格：
+服务规格：
规格设置：
@@ -257,25 +358,25 @@
- 
+
+
服务收益总额
-{{trans_all_obj.all}}
+{{ trans_all_obj.all }}
金币
- 
+
+
交易总数
-{{trans_all_obj.times}}
+{{ trans_all_obj.times }}
笔
- 
+
+
本月交易总数
-{{trans_all_obj.month}}
+{{ trans_all_obj.month }}
笔1221312
wuqwyequ827812731731', listTotal: 0, @@ -346,7 +447,7 @@ export default { pageSizes: [10, 20, 50], responseParamUrl: "", codeExampleUrl: "", - port_select_server:'', + port_select_server: "", yx_state: { state: "", averageTime: "", @@ -355,35 +456,35 @@ export default { maxTraffic: "", memory: "", }, - port_select:'', + port_select: "", service_use_arr: [], - req_solt_data:[], - res_solt_data:[], - req_gz_solt_data:[], - res_gz_solt_data:[], - service_gz_process_arr:[], - trans_all_obj:{ - all:0, - times:0, - month:0, + req_solt_data: [], + res_solt_data: [], + req_gz_solt_data: [], + res_gz_solt_data: [], + service_gz_process_arr: [], + trans_all_obj: { + all: 0, + times: 0, + month: 0, }, - trans_log_arr:[ + trans_log_arr: [ { title: "服务交易概览", info: "", - prop:'title', + prop: "title", type: "solt", solt_name: "trans_all", }, { title: "服务交易记录", info: "", - prop:'title', + prop: "title", type: "solt", solt_name: "trans_log", }, ], - trans_log_header:[ + trans_log_header: [ { prop: "department_name", label: "申请单位", @@ -427,7 +528,7 @@ export default { align: "center", }, ], - trans_log_data:[], + trans_log_data: [], res_solt_header_arr: [ { prop: "name", @@ -632,15 +733,27 @@ export default { ], // 响应参数-header res_data: [], // 响应参数 res_code_arr: "", // 响应示例 - req_solt_code_arr:'11', - res_solt_code_arr:'11', + req_solt_code_arr: "11", + res_solt_code_arr: "11", buy_type: "", - workflows_id:'',//判断是否是流程服务 + workflows_id: "", //判断是否是流程服务 sizeset_flag: false, //规格设置是否显示 service_arr: [ ["服务基本信息", "接口详细信息", "服务运行状态"], - ["服务基本信息", "接口详细信息", "服务运行状态", "服务计费规则","服务交易记录"], - ["服务基本信息", "接口详细信息", "服务运行状态", "服务规格","服务交易记录"], + [ + "服务基本信息", + "接口详细信息", + "服务运行状态", + "服务计费规则", + "服务交易记录", + ], + [ + "服务基本信息", + "接口详细信息", + "服务运行状态", + "服务规格", + "服务交易记录", + ], ], service_size_data: [], //服务规格数组 service_header_arr: { @@ -814,9 +927,9 @@ export default { label: "调用时间", minWidth: "20%", align: "center", - } + }, ], - service_process_arr:[], + service_process_arr: [], service_size_arr: [ { prop: "index", @@ -852,20 +965,23 @@ export default { edit_size_arr: [ { prop: "spcs_type", - label: '规格类型',
+ label:
+ '规格类型',
+ label:
+ '调用次数
+
服务地址：
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 共享
+ 受限
+ 敏感
+
+
+
+ 产品注册
+
+
+
+ 产品名称：
+产品简介：
+产品领域：
+产品版本：
+产品封面：
+产品标签：
+
+ 增加
+
+
+ {{ item }}
+
+
+ 产品介绍文档：
+
+ 产品介绍文档模版.md下载文件
+
+ 开放程度：
+ {
if (request.data.success == 1) {
this.form.origin = request.data.data.department;
+ this.form_cp.origin = request.data.data.department;
this.oid = request.data.data.department_id;
} else {
console.log(response.data.errMsg);
@@ -1496,6 +1672,40 @@ export default {
this.registePt();
}
},
+ registeCp() {
+ this.$refs.form_cp.validate((valid) => {
+ if (valid) {
+ if (this.form_cp.bq.length < 1 && this.form_cp.bq.length > 3) {
+ this.$message.error("产品标签至少1个，至多3个");
+ }
+ let query = {
+ name: this.form_cp.name,
+ sectors: this.form_cp.area,
+ organization: this.form_cp.origin,
+ cover: this.cover_cp[0],
+ openness: this.form_cp.resource,
+ descript: this.form_cp.desc,
+ data_service_type1: this.btnList[this.activeBtn].id,
+ data_service_type2: 0,
+ portal_id: "",
+ encode_method: "自动生成",
+ doc_file: this.wd_cp[0].url,
+ version: this.form_cp.bb,
+ tags: this.form_cp.bq,
+ urls: [],
+ };
+ this.$api.workbench.serviceAdd(query).then((response) => {
+ if (response.data.success == 1) {
+ this.$message.success("产品注册成功");
+ this.$router.push("/fwgl/" + this.$store.getters.level);
+ } else {
+ console.log(response.data.errMsg);
+ this.$message.error(response.data.errMsg);
+ }
+ });
+ }
+ });
+ },
registePt() {
this.$refs.form.validate((valid) => {
if (valid) {
@@ -1692,8 +1902,8 @@ export default {
getServiceType1() {
this.$api.workbench.getServiceTypeList().then((response) => {
if (response.data.success == 1) {
- this.btnList = response.data.data;
- this.btnList.forEach((item) => {
+ let arr = response.data.data;
+ arr.forEach((item) => {
switch (item.id) {
case 5:
item.default = "nav_ic_shujufw";
@@ -1715,10 +1925,22 @@ export default {
item.default = "nav_ic_zonghefw";
item.active = "nav_ic_zonghefw_sel";
break;
+ case 36:
+ item.default = "nav_ic_chanpinzy";
+ item.active = "nav_ic_chanpinzy_sel";
+ break;
default:
break;
}
});
+ let cp_index = arr.findIndex((item) => {
+ return item.id == 36;
+ });
+ let cp = arr[cp_index];
+ arr.splice(cp_index, 1);
+ arr.push(cp);
+ console.log(arr);
+ this.btnList = arr;
let skfwRadios = this.btnList[1].childDomains;
skfwRadios.splice(2, 1);
this.skfwRadios = skfwRadios;
@@ -2092,12 +2314,38 @@ export default {
}
}
},
+ delIp(index, type) {
+ if (type == "white") {
+ this.form_cp.bq.splice(index, 1);
+ } else if (type == "black") {
+ this.form_cp.bq.splice(index, 1);
+ }
+ },
+ addIp(type) {
+ if (type == "white") {
+ this.whiteAddShow
+ ? this.$message({
+ message: "请按回车完善本次ip填写",
+ type: "error",
+ })
+ : (this.whiteAddShow = true);
+ }
+ },
+ watchKeyboardWhite() {
+ let self = this;
+ if (self.newIpWhite != "") {
+ self.form_cp.bq.push(self.newIpWhite);
+ self.whiteAddShow = false;
+ self.newIpWhite = "";
+ }
+ },
},
mounted() {
let self = this;
window.addEventListener("message", self.listeners, false);
self.judgeMap();
self.getArea();
+ self.getOrganization();
},
created() {
let _self = this;
@@ -2325,6 +2573,66 @@ export default {
.gz_fhsjgs_rad {
margin-left: 10px;
}
+.ip_block {
+ border-radius: 8px;
+ border: solid 1px #e3e5ef;
+ padding: 10px 0 0 10px;
+ line-height: 24px;
+}
+.ip_item {
+ display: inline-block;
+ position: relative;
+ background-color: #e6ebfe;
+ border-radius: 4px;
+ color: #0f2683;
+ font-size: 12px;
+ line-height: 24px;
+ padding: 0 26px 0 8px;
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
+.ip_del {
+ position: absolute;
+ right: 8px;
+ top: 6px;
+ font-size: 14px;
+ color: #6573ae;
+ cursor: pointer;
+}
+.ip_del:hover {
+ color: #e56600;
+}
+.add_ip {
+ background-color: #495feb;
+ border-radius: 4px;
+ color: #f8f9fd;
+ font-size: 12px;
+ line-height: 24px;
+ padding: 0 8px;
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
+.ip_input {
+ width: 110px;
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
+.filebtn {
+ width: 76px;
+ height: 32px;
+ line-height: 32px;
+ text-align: center;
+ color: #e6ebfe;
+ background-color: #515fe7;
+ border-radius: 6px;
+ display: inline-block;
+ font-size: 14px;
+ margin-left: 8px;
+ cursor: pointer;
+}
+.cp_mb {
+ padding: 0 0 16px 8px;
+}
diff --git a/src/router/index.js b/src/router/index.js
index df0849c4d577f652e985d866284c6b420201a433..4e793c3437ff4db99606010fd29e2bf131693fdf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -73,18 +73,18 @@ export default new Router({
}, // 审批的服务 - 详情
{
path: "/fwgl/:level/:type/cloud_detail/:id",
- name: "servicedetail",
+ name: "cloud_detail",
component: () => import("@/pages/workbench/fwgl/cloud-detail"),
}, // 云资源 - 详情
{
path: "/fwgl/:level/:type/approveWorkspace",
- name: "servicedetail",
+ name: "approveWorkspace",
component: () =>
import("@/pages/workbench/fwgl/approveWorkspace"),
}, // 云资源 - 工作区域审批
{
path: "/fwgl/:level/:type/organizationCloudResource/:id",
- name: "servicedetail",
+ name: "organizationCloudResource",
component: () =>
import("@/pages/workbench/fwgl/organizationCloudResource"),
}, // 云资源 - 组织云资源详情
@@ -322,6 +322,11 @@ export default new Router({
name: "shopAppStoreList",
component: () => import("@/pages/service_shop/shop_list-new"),
},
+ {
+ path: "/shop/products_list/", // 应用商店列表页
+ name: "shopAppStoreList",
+ component: () => import("@/pages/service_shop/shop_list-new"),
+ },
{
path: "/shop/shopping_cart", // 购物车页
name: "shoppingCart",
@@ -364,6 +369,11 @@ export default new Router({
name: "yysdDetail",
component: () => import("@/pages/service_shop/yysdDetail"),
}, // 服务超市 - 应用详情
+ {
+ path: "/shop/cpDetail/:id",
+ name: "cpDetail",
+ component: () => import("@/pages/service_shop/cpDetail"),
+ }, // 服务超市 - 产品资源详情
{
path: "/workplace",
name: "workPlace",
diff --git a/yarn.lock b/yarn.lock
index f2b0061a5deb48d1e3a8b95e3ac60870a1182105..9ed43797c02fdef0d3bc3677ed9a03c9be67adf2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4801,6 +4801,19 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"
+markdown-loader@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.npm.taobao.org/markdown-loader/download/markdown-loader-6.0.0.tgz#7f8d40ee98b32d3bb8c5387d58e679600d3edeaa"
+ integrity sha1-f41A7pizLTu4xTh9WOZ5YA0+3qo=
+ dependencies:
+ loader-utils "^1.2.3"
+ marked "^0.7.0"
+
+marked@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.npm.taobao.org/marked/download/marked-0.7.0.tgz?cache=0&sync_timestamp=1608062041411&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmarked%2Fdownload%2Fmarked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e"
+ integrity sha1-tkIB8FHScbHtwQoE0a6bdLuOXA4=
+
material-design-icons-iconfont@^4.0.5:
version "4.0.5"
resolved "https://registry.npm.taobao.org/material-design-icons-iconfont/download/material-design-icons-iconfont-4.0.5.tgz#4107ba3b8a9d688a3d9325fc7363af51b17d3aee"