Commit 1ac181a7 authored by 刘殿昕's avatar 刘殿昕

Merge branch 'dev'

parents 47b626e4 ac66515e
.w-e-toolbar,
.w-e-text-container,
.w-e-menu-panel {
padding: 0;
margin: 0;
box-sizing: border-box;
background-color: #fff;
/*表情菜单样式*/
.eleImg{
cursor: pointer;
display: inline-block;
font-size: 18px;
padding: 0 3px;
}
* {
padding: 0;
margin: 0;
box-sizing: border-box;
}
/*分割线样式*/
hr{
cursor: pointer;
display: block;
height: 0px;
border: 0;
border-top: 3px solid #ccc;
margin: 20px 0;
}
}
.w-e-clear-fix:after {
content: "";
display: table;
clear: both;
}
.w-e-drop-list-item {
position: relative;
top: 1px;
padding-right: 7px;
color: #333 !important;
}
.w-e-drop-list-tl {
padding-left: 10px;
text-align: left;
}
.w-e-table{
display: flex;
.w-e-table-input{
width: 40px;
text-align: center!important;
margin: 0 5px;
}
}
\ No newline at end of file
.w-e-text-container {
overflow: hidden;
}
.w-e-img-drag-mask {
position: absolute;
z-index: 1;
border: 1px dashed #ccc;
box-sizing: border-box;
.w-e-img-drag-rb {
position: absolute;
right: -5px;
bottom: -5px;
width: 16px;
height: 16px;
border-radius: 50%;
background: #ccc;
cursor: se-resize;
}
.w-e-img-drag-show-size {
min-width: 110px;
height: 22px;
line-height: 22px;
font-size: 14px;
color: #999;
position: absolute;
left: 0;
top: 0;
background-color: #999;
color: #fff;
border-radius: 2px;
padding: 0 5px;
}
}
\ No newline at end of file
.w-e-toolbar {
.w-e-droplist {
position: absolute;
left: 0;
top: 0;
background-color: #fff;
border: 1px solid #f1f1f1;
border-right-color: #ccc;
border-bottom-color: #ccc;
.w-e-dp-title {
text-align: center;
color: #999;
line-height: 2;
border-bottom: 1px solid #f1f1f1;
font-size: 13px;
}
ul.w-e-list {
list-style: none;
line-height: 1;
li.w-e-item {
color: #333;
padding: 5px 0;
&:hover {
background-color: #f1f1f1;
}
}
}
ul.w-e-block {
list-style: none;
text-align: left;
padding: 5px;
li.w-e-item {
display: inline-block;
padding: 3px 5px;
&:hover {
background-color: #f1f1f1;
}
}
}
}
}
\ No newline at end of file
.w-e-full-screen-editor {
position: fixed;
width:100%!important;
height:100%!important;
left:0;
top:0;
}
\ No newline at end of file
@font-face {
font-family: 'w-e-icon';
src: url('../font/w-e-icon.woff?ddq1c7') format('truetype');
font-weight: normal;
font-style: normal;
}
[class^="w-e-icon-"], [class*=" w-e-icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'w-e-icon' !important;
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.w-e-icon-close:before {
content: "\f00d";
}
.w-e-icon-upload2:before {
content: "\e9c6";
}
.w-e-icon-trash-o:before {
content: "\f014";
}
.w-e-icon-header:before {
content: "\f1dc";
}
.w-e-icon-pencil2:before {
content: "\e906";
}
.w-e-icon-paint-brush:before {
content: "\f1fc";
}
.w-e-icon-image:before {
content: "\e90d";
}
.w-e-icon-play:before {
content: "\e912";
}
.w-e-icon-location:before {
content: "\e947";
}
.w-e-icon-undo:before {
content: "\e965";
}
.w-e-icon-redo:before {
content: "\e966";
}
.w-e-icon-quotes-left:before {
content: "\e977";
}
.w-e-icon-list-numbered:before {
content: "\e9b9";
}
.w-e-icon-list2:before {
content: "\e9bb";
}
.w-e-icon-link:before {
content: "\e9cb";
}
.w-e-icon-happy:before {
content: "\e9df";
}
.w-e-icon-bold:before {
content: "\ea62";
}
.w-e-icon-underline:before {
content: "\ea63";
}
.w-e-icon-italic:before {
content: "\ea64";
}
.w-e-icon-strikethrough:before {
content: "\ea65";
}
.w-e-icon-table2:before {
content: "\ea71";
}
.w-e-icon-paragraph-left:before {
content: "\ea77";
}
.w-e-icon-paragraph-center:before {
content: "\ea78";
}
.w-e-icon-paragraph-right:before {
content: "\ea79";
}
.w-e-icon-terminal:before {
content: "\f120";
}
.w-e-icon-page-break:before {
content: "\ea68";
}
.w-e-icon-cancel-circle:before {
content: "\ea0d";
}
.w-e-icon-font:before {
content: "\ea5c";
}
.w-e-icon-text-heigh:before {
content: "\ea5f";
}
.w-e-icon-paint-format:before {
content: "\e90c";
}
.w-e-icon-indent-increase:before {
content: "\ea7b";
}
.w-e-icon-indent-decrease:before {
content: "\ea7c";
}
.w-e-icon-row-height:before {
content: "\e9be";
}
.w-e-icon-fullscreen_exit:before {
content: "\e900";
}
.w-e-icon-fullscreen:before {
content: "\e901";
}
.w-e-icon-split-line:before {
content: "\ea0b";
}
.w-e-icon-checkbox-checked:before {
content: "\ea52";
}
\ No newline at end of file
.w-e-toolbar {
display: flex;
padding: 0 6px;
flex-wrap: wrap;
/* 单个菜单 */
.w-e-menu {
position: relative;
display: flex;
width: 40px;
height: 40px;
align-items: center;
justify-content: center;
text-align: center;
cursor: pointer;
i {
color: #999;
}
&:hover {
background-color: #F6F6F6;
i {
color: #333;
}
}
}
.w-e-active {
i {
color: #1e88e5;
}
&:hover {
i {
color: #1e88e5;
}
}
}
}
\ No newline at end of file
.w-e-menu {
.w-e-panel-container {
position: absolute;
top: 0;
left: 50%;
border: 1px solid #ccc;
border-top: 0;
box-shadow: 1px 1px 2px #ccc;
color: #333;
background-color: #fff;
text-align: left;
.w-e-panel-close {
position: absolute;
right: 0;
top: 0;
padding: 5px;
margin: 2px 5px 0 0;
cursor: pointer;
color: #999;
&:hover {
color: #333;
}
}
.w-e-panel-tab-title {
list-style: none;
display: flex;
font-size: 14px;
margin: 2px 10px 0 10px;
border-bottom: 1px solid #f1f1f1;
.w-e-item {
padding: 3px 5px;
color: #999;
cursor: pointer;
margin: 0 3px;
position: relative;
top: 1px;
}
.w-e-active {
color: #333;
border-bottom: 1px solid #333;
cursor: default;
font-weight: 700;
}
}
.w-e-panel-tab-content {
padding: 10px 15px 10px 15px;
font-size: 16px;
/* 输入框的样式 */
input,textarea,button {
&:focus {
outline: none;
}
}
textarea {
width: 100%;
border: 1px solid #ccc;
padding: 5px;
margin-top: 10px;
&:focus {
border-color: #1e88e5;
}
}
input[type=text] {
border: none;
border-bottom: 1px solid #ccc;
font-size: 14px;
height: 20px;
color: #333;
text-align: left;
}
input[type=text].small {
width: 30px;
text-align: center;
}
input[type=text].block {
display: block;
width: 100%;
margin: 10px 0;
}
input[type=text]:focus {
border-bottom: 2px solid #1e88e5;
}
/* 按钮的样式 */
.w-e-button-container {
button {
font-size: 14px;
color: #1e88e5;
border: none;
padding: 5px 10px;
background-color: #fff;
cursor: pointer;
border-radius: 3px;
}
button.left {
float: left;
margin-right: 10px;
}
button.right {
float: right;
margin-left: 10px;
}
button.gray {
color: #999;
}
button.red {
color: rgb(194, 79, 74);
}
button:hover {
background-color: #f1f1f1;
}
}
.w-e-button-container:after {
content: "";
display: table;
clear: both;
}
}
/* 为 emotion panel 定制的样式 */
.w-e-emoticon-container {
.w-e-item {
cursor: pointer;
font-size: 18px;
padding: 0 3px;
display: inline-block;
}
}
/* 上传图片的 panel 定制样式 */
.w-e-up-img-container {
text-align: center;
.w-e-up-btn {
display: inline-block;
color: #999;
cursor: pointer;
font-size: 60px;
line-height: 1;
&:hover {
color: #333;
}
}
}
}
}
\ No newline at end of file
.w-e-text-container {
position: relative;
.w-e-progress {
position: absolute;
background-color: #1e88e5;
top: 0;
left: 0;
height: 1px;
}
.placeholder {
color: #D4D4D4;
position: absolute;
font-size: 11pt;
line-height: 22px;
left: 10px;
top: 10px;
user-select: none;
z-index: -1;
}
}
.w-e-text {
padding: 0 10px;
overflow-y: auto;
p,h1,h2,h3,h4,h5,table,pre {
margin: 10px 0;
line-height: 1.5;
}
ul, ol {
margin: 10px 0 10px 20px;
}
blockquote {
display: block;
border-left: 8px solid #d0e5f2;
padding: 5px 10px;
margin: 10px 0;
line-height: 1.4;
font-size: 100%;
background-color: #f1f1f1;
}
code {
display: inline-block;
background-color: #f1f1f1;
border-radius: 3px;
padding: 3px 5px;
margin: 0 3px;
}
pre {
code {
display: block;
}
}
table {
border-top: 1px solid #ccc;
border-left: 1px solid #ccc;
td,th {
border-bottom: 1px solid #ccc;
border-right: 1px solid #ccc;
padding: 3px 5px;
min-height: 30px;
}
th {
border-bottom: 2px solid #ccc;
text-align: center;
background-color: #f1f1f1;
}
}
&:focus {
outline: none;
}
img {
cursor: pointer;
&:hover {
box-shadow: 0 0 5px #333;
}
}
}
.w-e-tooltip {
position: absolute;
display: flex;
color: #f1f1f1;
background-color: rgba(0,0,0,.75);
box-shadow: 0 2px 8px 0 rgba(0,0,0,.15);
border-radius: 4px;
padding: 4px 5px 6px;
position: absolute;
}
// 下箭头
.w-e-tooltip-up::after {
content: "";
position: absolute;
top: 100%;
left: 50%;
margin-left: -5px;
border: 5px solid rgba(0,0,0,0);
border-top-color: rgba(0,0,0,.73);
}
// 上箭头
.w-e-tooltip-down::after {
content: "";
position: absolute;
bottom: 100%;
left: 50%;
margin-left: -5px;
border: 5px solid rgba(0,0,0,0);
border-bottom-color: rgba(0,0,0,.73);
}
.w-e-tooltip-item-wrapper {
cursor: pointer;
font-size: 14px;
margin: 0 5px;
&:hover {
color: #ccc;
text-decoration: underline;
}
}
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<span>更新时间:{{ time || "-" }}</span> <span>更新时间:{{ time || "-" }}</span>
</h3> </h3>
<div <div
class="part_content doc_content apaas_scroll" class="part_content doc_content w-e-text w-e-text-container apaas_scroll"
v-html="content" v-html="content"
ref="docContent" ref="docContent"
></div> ></div>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
]" ]"
:key="index" :key="index"
> >
<a v-text="item.title" @click="clickNav(item)"></a> <a v-html="item.title" @click="clickNav(item)"></a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -87,22 +87,22 @@ export default { ...@@ -87,22 +87,22 @@ export default {
pre_h2_index = 0; pre_h2_index = 0;
pre_h3_index = 0; pre_h3_index = 0;
level = 1; level = 1;
id = `nav_${pre_h1_index}` + "_" + time; id = `nav_${pre_h1_index}_${time}`;
newTitle = title.replace(/<h1/g, `<h1 id="${id}"`); newTitle = title.replace(/<h1/g, `<h1 id="${id}"`);
} else if (title.match(/<h2(([\s\S])*?)<\/h2>/g)) { } else if (title.match(/<h2(([\s\S])*?)<\/h2>/g)) {
pre_h2_index++; pre_h2_index++;
pre_h3_index = 0; pre_h3_index = 0;
level = 2; level = 2;
id = `nav_${pre_h1_index}_${pre_h2_index}` + "_" + time; id = `nav_${pre_h1_index}_${pre_h2_index}_${time}`;
newTitle = title.replace(/<h2/g, `<h2 id="${id}"`); newTitle = title.replace(/<h2/g, `<h2 id="${id}"`);
} else if (title.match(/<h3(([\s\S])*?)<\/h3>/g)) { } else if (title.match(/<h3(([\s\S])*?)<\/h3>/g)) {
pre_h3_index++; pre_h3_index++;
level = 3; level = 3;
id = `nav_${pre_h1_index}_${pre_h2_index}_${pre_h3_index}`; id = `nav_${pre_h1_index}_${pre_h2_index}_${pre_h3_index}_${time}`;
newTitle = title.replace(/<h3/g, `<h3 id="${id}"`) + "_" + time; newTitle = title.replace(/<h3/g, `<h3 id="${id}"`);
} }
content = content.replace(new RegExp(title), newTitle); content = content.replace(new RegExp(title), newTitle);
......
...@@ -4,6 +4,13 @@ import store from "@/store"; ...@@ -4,6 +4,13 @@ import store from "@/store";
import Vue from 'vue' import Vue from 'vue'
import '../src/assets/style/common.less'
import '../src/assets/style/icon.less'
import '../src/assets/style/menus.less'
import '../src/assets/style/text.less'
import '../src/assets/style/panel.less'
import '../src/assets/style/droplist.less'
import mavonEditor from 'mavon-editor' import mavonEditor from 'mavon-editor'
import 'mavon-editor/dist/css/index.css' import 'mavon-editor/dist/css/index.css'
Vue.use(mavonEditor) Vue.use(mavonEditor)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<span>{{ question.view }}</span> <span>{{ question.view }}</span>
</span> </span>
</p> </p>
<div class="ques_content" v-html="question.content"></div> <div class="ques_content w-e-text w-e-text-container" v-html="question.content"></div>
</div> </div>
<div class="answer"> <div class="answer">
<p>{{answer_total}}条回答</p> <p>{{answer_total}}条回答</p>
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
width="1340px" width="1340px"
> >
<div <div
class="detail_content apaas_scroll" class="detail_content w-e-text w-e-text-container apaas_scroll"
slot="content" slot="content"
v-html="detail.content" v-html="detail.content"
></div> ></div>
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
width="1340px" width="1340px"
> >
<div <div
class="view_content apaas_scroll" class="view_content w-e-text w-e-text-container apaas_scroll"
slot="content" slot="content"
v-html="detailForm.content" v-html="detailForm.content"
></div> ></div>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="type_box_select"> <div class="type_box_select">
<info-list :list_arr="process_in_up_arr" v-if="now_service == 1&&process_in_up"> <info-list :list_arr="process_in_up_arr" v-if="now_service == 1&&process_in_up">
<div slot="service_port" class="service_port"> <div slot="service_port" class="service_port">
<el-select v-model="port_select" placeholder=""> <el-select v-model="port_select" placeholder="" @change="change_port">
<el-option <el-option
v-for="item in port_options" v-for="item in port_options"
:key="item.value" :key="item.value"
...@@ -52,18 +52,18 @@ ...@@ -52,18 +52,18 @@
<info-list :list_arr="perception_solt_arr" v-if="now_service == 1&&perception_in"> <info-list :list_arr="perception_solt_arr" v-if="now_service == 1&&perception_in">
<table-um <table-um
:headers="perception_req_solt_header_arr" :headers="perception_req_solt_header_arr"
:datas="perception_req_solt_data" :datas="req_solt_data"
:stripe="true" :stripe="true"
slot="request_table" slot="request_table"
></table-um> ></table-um>
<v-apaas-code :datas="perception_req_solt_code_arr" slot="request_code" :readOnly="true"></v-apaas-code> <v-apaas-code :datas="req_solt_code_arr" slot="request_code" :readOnly="true"></v-apaas-code>
<table-um <table-um
:headers="perception_res_solt_header_arr" :headers="perception_res_solt_header_arr"
:datas="perception_res_solt_data" :datas="res_solt_data"
:stripe="true" :stripe="true"
slot="response_table" slot="response_table"
></table-um> ></table-um>
<v-apaas-code :datas="perception_res_solt_code_arr" slot="response_code" :readOnly="true"></v-apaas-code> <v-apaas-code :datas="res_solt_code_arr" slot="response_code" :readOnly="true"></v-apaas-code>
</info-list> </info-list>
<info-list <info-list
v-else v-else
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
align: "left", align: "left",
}, },
{ {
prop: "is_must", prop: "example",
label: "字段示例数值", label: "字段示例数值",
align: "center", align: "center",
width: 240, width: 240,
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
align: "left", align: "left",
}, },
{ {
prop: "is_must", prop: "example",
label: "字段示例数值", label: "字段示例数值",
align: "center", align: "center",
width: 240, width: 240,
...@@ -220,7 +220,7 @@ export default { ...@@ -220,7 +220,7 @@ export default {
align: "center", align: "center",
}, },
{ {
prop: "is_must", prop: "example",
label: "字段示例数值", label: "字段示例数值",
align: "center", align: "center",
width: 240, width: 240,
...@@ -256,33 +256,21 @@ export default { ...@@ -256,33 +256,21 @@ export default {
align: "center", align: "center",
}, },
{ {
prop: "is_must", prop: "example",
label: "字段示例数值", label: "字段示例数值",
align: "center", align: "center",
width: 240, width: 240,
}, },
], ],
port_options:[ port_options:[],
{
label:'接口1',
value:'qweqweqsdfsdf',
able:true,
},
{
label:'接口2',
value:'qweqweqsdfsdfwer2w23',
able:false,
},
],
port_solt_arr:[ port_solt_arr:[
{ {
title: "服务地址:", title: "服务地址:",
info: "12312312", info: "",
}, },
{ {
title: "请求方式:", title: "请求方式:",
info: "12123", info: "",
}, },
{ {
title: "编码格式:", title: "编码格式:",
...@@ -316,13 +304,13 @@ export default { ...@@ -316,13 +304,13 @@ export default {
perception_solt_arr:[ perception_solt_arr:[
{ {
title: "接口文档:", title: "接口文档:",
info: "接口文档示例.docx", info: "",
url: "11111", url: "",
type: "down", type: "down",
}, },
{ {
title: "请求方式:", title: "请求方式:",
info: "12123", info: "",
}, },
{ {
title: "编码格式:", title: "编码格式:",
...@@ -356,8 +344,8 @@ export default { ...@@ -356,8 +344,8 @@ export default {
process_in_up_arr:[ process_in_up_arr:[
{ {
title: "接口文档:", title: "接口文档:",
info: "接口文档示例.docx", info: "",
url: "11111", url: "",
type: "down", type: "down",
}, },
{ {
...@@ -674,6 +662,19 @@ export default { ...@@ -674,6 +662,19 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { 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
}
});
},
get_service_info() { get_service_info() {
this.$http this.$http
.get( .get(
...@@ -732,21 +733,45 @@ export default { ...@@ -732,21 +733,45 @@ export default {
//判断是否是服务注册出来的流程服务 //判断是否是服务注册出来的流程服务
if(data.data_service_type2 == 24&&data.workflows_id==0){ if(data.data_service_type2 == 24&&data.workflows_id==0){
this.process_in_up = true 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{ }else{
this.process_in_up = false this.process_in_up = false
} }
if(data.service_data_type_1 == 10){ if(data.service_data_type_1 == 10){
this.perception_in = true 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{ }else{
this.perception_in = false this.perception_in = false
} }
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)
}
if(this.service_apply_type==1){ if(this.service_apply_type==1){
this.$set( this.$set(
this.service_header_arr["first"][2], this.service_header_arr["first"][2],
...@@ -769,6 +794,11 @@ export default { ...@@ -769,6 +794,11 @@ export default {
.split("+")[0] .split("+")[0]
); );
} }
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[0], "info", data.descript);
this.$set(this.list_arr[1], "info", data.data_service_type2_name); this.$set(this.list_arr[1], "info", data.data_service_type2_name);
this.$set( this.$set(
......
...@@ -1211,11 +1211,11 @@ export default { ...@@ -1211,11 +1211,11 @@ export default {
? `访问次数:${e.request_spcs.count}/日 访问量:${e.request_spcs.pv}/日` ? `访问次数:${e.request_spcs.count}/日 访问量:${e.request_spcs.pv}/日`
: "", : "",
sqsc: e.duration + ["", "个月", ""][e.duration_unit || 0], sqsc: e.duration + ["", "个月", ""][e.duration_unit || 0],
jkmc:'', jkmc:e.req_name||'',
jkdz:'', jkdz:e.req_url||'',
state:'', state:(e.req_status||e.req_status==0)?e.req_status==-1?'失败':'成功':'',
time:'', time:e.last_request_time?e.last_request_time.split("+")[0].replace("T", " "):'-',
count:'' count:e.req_num||'-'
}); });
}); });
} }
......
...@@ -80,7 +80,13 @@ ...@@ -80,7 +80,13 @@
(用于查询流程状态) (用于查询流程状态)
</p> </p>
</div> </div>
<div v-show="(activeBtn == 4 && zhyyVal == 24) || activeBtn == 3"> <div
v-show="
(activeBtn == 4 && zhyyVal == 24) ||
activeBtn == 3 ||
activeBtn == 2
"
>
<div class="fwcs_fwdz"> <div class="fwcs_fwdz">
上传接口文档 上传接口文档
<span class="title_bc">(请上传所有服务地址完整接口文档)</span> <span class="title_bc">(请上传所有服务地址完整接口文档)</span>
...@@ -147,7 +153,7 @@ ...@@ -147,7 +153,7 @@
服务测试 服务测试
</el-button> </el-button>
</div> </div>
<div v-if="activeBtn == 0 || activeBtn == 3"> <div v-if="activeBtn == 0 || activeBtn == 2 || activeBtn == 3">
<el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab"> <el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
<el-tab-pane label="请求参数" name="0"> <el-tab-pane label="请求参数" name="0">
<ces-table <ces-table
...@@ -370,7 +376,10 @@ ...@@ -370,7 +376,10 @@
</div> </div>
<div <div
v-show=" v-show="
(activeBtn == 1 || (activeBtn == 4 && zhyyVal == 34)) && resSuccess (activeBtn == 1 ||
activeBtn == 2 ||
(activeBtn == 4 && zhyyVal == 34)) &&
resSuccess
" "
> >
<div class="skfw_csfwxx">测试服务信息:</div> <div class="skfw_csfwxx">测试服务信息:</div>
...@@ -387,6 +396,7 @@ ...@@ -387,6 +396,7 @@
v-show=" v-show="
(activeBtn == 0 || (activeBtn == 0 ||
activeBtn == 1 || activeBtn == 1 ||
activeBtn == 2 ||
activeBtn == 3 || activeBtn == 3 ||
activeBtn == 4) && activeBtn == 4) &&
!resSuccess !resSuccess
...@@ -804,8 +814,8 @@ export default { ...@@ -804,8 +814,8 @@ export default {
{ label: "DELETE", value: "DELETE" }, { label: "DELETE", value: "DELETE" },
], ],
optionType1: [{ label: "GET", value: "GET" }], optionType1: [{ label: "GET", value: "GET" }],
activeName: 0, activeName: "0",
activeZh: 0, activeZh: "0",
sjfwQqcs: [ sjfwQqcs: [
{ {
label: "请求字段编码", label: "请求字段编码",
...@@ -1132,7 +1142,7 @@ export default { ...@@ -1132,7 +1142,7 @@ export default {
bodys = this.$refs.jsonCodes ? this.$refs.jsonCodes.getCodesVal() : ""; bodys = this.$refs.jsonCodes ? this.$refs.jsonCodes.getCodesVal() : "";
contentType = this.sjfwQqt; contentType = this.sjfwQqt;
} else if (this.activeBtn == 4) { } else if (this.activeBtn == 4) {
if (this.activeZh == 1) { if (this.activeZh == "1") {
contentType = this.zhfwQqt; contentType = this.zhfwQqt;
if (this.zhfwQqt == "JSON") { if (this.zhfwQqt == "JSON") {
bodys = this.$refs.zhfwJsonCodes bodys = this.$refs.zhfwJsonCodes
...@@ -1204,10 +1214,12 @@ export default { ...@@ -1204,10 +1214,12 @@ export default {
nextJcxx() { nextJcxx() {
if ( if (
this.activeBtn == 0 || this.activeBtn == 0 ||
this.activeBtn == 2 ||
this.activeBtn == 3 || this.activeBtn == 3 ||
(this.activeBtn == 4 && (this.zhyyVal == 22 || this.zhyyVal == 23)) (this.activeBtn == 4 && (this.zhyyVal == 22 || this.zhyyVal == 23))
) { ) {
if ( if (
this.activeBtn == 2 ||
this.activeBtn == 3 || this.activeBtn == 3 ||
(this.activeBtn == 4 && this.zhyyVal == 22) (this.activeBtn == 4 && this.zhyyVal == 22)
) { ) {
...@@ -1231,6 +1243,23 @@ export default { ...@@ -1231,6 +1243,23 @@ export default {
this.$message.error("请完善返回参数信息中的字段名称"); 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 if (this.activeBtn == 1) { } else if (this.activeBtn == 1) {
let value = helper.getQueryString("id", this.serviceUrl); let value = helper.getQueryString("id", this.serviceUrl);
...@@ -1410,7 +1439,7 @@ export default { ...@@ -1410,7 +1439,7 @@ export default {
if (this.activeBtn == 0 || this.activeBtn == 3) { if (this.activeBtn == 0 || this.activeBtn == 3) {
contentType = this.sjfwQqt; contentType = this.sjfwQqt;
} else if (this.activeBtn == 4) { } else if (this.activeBtn == 4) {
if (this.activeZh == 1) { if (this.activeZh == "1") {
contentType = this.zhfwQqt; contentType = this.zhfwQqt;
} }
} }
......
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