up

src/pages/workbench/fwzc_fwcs.vue

@@ -62,6 +62,17 @@
           </el-button>
         </el-row>
         <div class="gray_line"></div>
+        <div class="fwcs_fwdz" v-if="process_id == '' && is_map == 0">
+          接口协议：
+        </div>
+        <el-radio-group
+          v-model="jkxy"
+          class="jkxy"
+          @change="test"
+          v-if="process_id == '' && is_map == 0"
+        >
+          <el-radio v-for="(e,i) in jkxyList" :key="'xy' + i" :label="e.value">{{e.label}}</el-radio>
+        </el-radio-group>
         <div v-if="activeBtn == 4">
           <div class="sqxx_title">服务类型：</div>
           <el-select
@@ -95,7 +106,7 @@
         <div v-show="
             (activeBtn == 4 && zhyyVal == 24) ||
             activeBtn == 3 ||
-            activeBtn == 2
+            activeBtn == 2 || jkxy !== 1
           ">
           <div class="fwcs_fwdz">
             上传接口文档
@@ -125,26 +136,14 @@
             <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) || jkxy !== 'http(s)'"
+          v-if="!(activeBtn == 4 && zhyyVal == 24) && jkxy == 1"
           class="fwcs_fwdz"
         >
           服务地址：
         </div>
         <div
-          v-if="!(activeBtn == 4 && zhyyVal == 24) || jkxy !== 'http(s)'"
+          v-if="!(activeBtn == 4 && zhyyVal == 24) && jkxy == 1"
           class="fwcs_fwdz_inner"
         >
           <el-input
@@ -200,7 +199,58 @@
             服务测试
           </el-button>
         </div>
-        <div v-if="activeBtn == 0 || activeBtn == 2 || activeBtn == 3 || jkxy == 'http(s)'">
+
+        <div
+          v-if="jkxy == 2"
+          class="fwcs_fwdz"
+        >
+          IP+端口号：
+        </div>
+        <div
+          v-if="jkxy == 2"
+          class="fwcs_fwdz_inner"
+        >
+          <el-input
+            placeholder="请输入内容"
+            @input="getUrl"
+            v-model="serviceUrl"
+            class="input-with-select"
+          >
+            
+          </el-input>
+          <el-button
+            @click="clickFwcs()"
+            class="fwcs_btn_fwcs"
+          >
+            服务测试
+          </el-button>
+        </div>
+        <div
+          v-if="jkxy == 3"
+          class="fwcs_fwdz"
+        >
+          服务地址：
+        </div>
+        <div
+          v-if="jkxy == 3"
+          class="fwcs_fwdz_inner"
+        >
+          <el-input
+            placeholder="请输入内容"
+            @input="getUrl"
+            v-model="serviceUrl"
+            class="input-with-select"
+          >
+            
+          </el-input>
+          <el-button
+            @click="clickFwcs()"
+            class="fwcs_btn_fwcs"
+          >
+            服务测试
+          </el-button>
+        </div>
+        <div v-if="(activeBtn == 0 || activeBtn == 2 || activeBtn == 3) && jkxy == 1">
           <el-tabs
             v-model="activeName"
             class="fwcs_tabs"
@@ -339,7 +389,7 @@
             >{{ item.name }}</el-radio>
           </div>
         </div>
-        <div v-if="activeBtn == 4 && zhyyVal != 34 && zhyyVal != 24">
+        <div v-if="activeBtn == 4 && zhyyVal != 34 && zhyyVal != 24  && jkxy == 1">
           <el-tabs
             v-model="activeZh"
             class="fwcs_tabs"
@@ -566,7 +616,7 @@
           </el-button>
         </div>
       </block-radius>
-      <div v-if="activeBtn == 4 && zhyyVal == 24">
+      <div v-if="activeBtn == 4 && zhyyVal == 24 && jkxy == 1">
         <!-- 24 -->
         <block-radius
           v-for="(itemOne, indexOne) in liucheng_list"
@@ -896,7 +946,7 @@
                 @getNewList="getNewList"
               ></upload-file>
             </el-form-item>
-            <el-form-item>
+            <el-form-item v-if="jkxy == 1">
               <p class="formname">接口编码：</p>
               <el-input
                 v-model="form.code"
@@ -1003,7 +1053,6 @@ export default {
   },
   data() {
     return {
-      jkxy: "http(s)",
       liucheng_list: [
         {
           one_input: "",
@@ -1167,6 +1216,21 @@ export default {
       skfwRadios: [],
       optionsZhyy: [],
       zhyyVal: 22,
+      jkxy: 1,
+      jkxyList: [
+        {
+          label: "http(s)",
+          value: 1,
+        },
+        {
+          label: "grpc",
+          value: 2,
+        },
+        {
+          label: "websocket",
+          value: 3,
+        },
+      ],
       jcxxtx: false,
       form: {
         name: "",
@@ -1265,6 +1329,9 @@ export default {
   computed: {},
   watch: {},
   methods: {
+    test() {
+      console.log(this.jkxy)
+    },
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
@@ -1275,6 +1342,7 @@ export default {
       });
     },
     clickBtn(val) {
+      this.jkxy = 1
       this.resultShow = false;
       this.activeBtn = val;
       this.select = "GET";
@@ -1345,121 +1413,128 @@ export default {
       let headers = {};
       let requestData = {};
       let requestHeaderDataObj = {};
-      if (this.activeBtn == 0 || this.activeBtn == 3) {
-        if (this.sqfsVal == 1 || this.sqfsVal == 3) {
-          if (this.tokenName == "") {
-            this.$message.error("请输入token名称");
-            return;
-          }
-          if (this.tokenVal == "") {
-            this.$message.error("请输入token值");
-            return;
+      let request = []
+      let bodys = "";
+      let contentType = "";
+      if (this.jkxy != 1) {
+      }else {
+        if (this.activeBtn == 0 || this.activeBtn == 3) {
+          if (this.sqfsVal == 1 || this.sqfsVal == 3) {
+            if (this.tokenName == "") {
+              this.$message.error("请输入token名称");
+              return;
+            }
+            if (this.tokenVal == "") {
+              this.$message.error("请输入token值");
+              return;
+            }
           }
-        }
-        let request = this.$refs.fwcs_sjfw_qq.getTableData();
-        for (let i = 0; i < request.length; i++) {
-          if (
-            request[i] &&
-            request[i].requestEncoding &&
-            request[i].requestValue &&
-            request[i].requestEncoding != "" &&
-            request[i].requestValue != ""
-          ) {
+          let request = this.$refs.fwcs_sjfw_qq.getTableData();
+          for (let i = 0; i < request.length; i++) {
             if (
-              Object.keys(requestData).indexOf(request[i].requestEncoding) == -1
+              request[i] &&
+              request[i].requestEncoding &&
+              request[i].requestValue &&
+              request[i].requestEncoding != "" &&
+              request[i].requestValue != ""
             ) {
-              requestData[request[i].requestEncoding] = [];
-              requestData[request[i].requestEncoding][0] =
-                request[i].requestValue;
-            } else {
-              requestData[request[i].requestEncoding].push(
-                request[i].requestValue
-              );
+              if (
+                Object.keys(requestData).indexOf(request[i].requestEncoding) == -1
+              ) {
+                requestData[request[i].requestEncoding] = [];
+                requestData[request[i].requestEncoding][0] =
+                  request[i].requestValue;
+              } else {
+                requestData[request[i].requestEncoding].push(
+                  request[i].requestValue
+                );
+              }
             }
           }
-        }
-      } else if (this.activeBtn == 1) {
-      } else if (this.activeBtn == 4 && this.zhyyVal != 34) {
-        let request = this.$refs.fwcs_zhfw_qq.getTableData();
-        for (let i = 0; i < request.length; i++) {
-          if (
-            request[i] &&
-            request[i].requestEncoding &&
-            request[i].requestValue &&
-            request[i].requestEncoding != "" &&
-            request[i].requestValue != ""
-          ) {
+        } else if (this.activeBtn == 1) {
+        } else if (this.activeBtn == 4 && this.zhyyVal != 34) {
+          let request = this.$refs.fwcs_zhfw_qq.getTableData();
+          for (let i = 0; i < request.length; i++) {
             if (
-              Object.keys(requestData).indexOf(request[i].requestEncoding) == -1
+              request[i] &&
+              request[i].requestEncoding &&
+              request[i].requestValue &&
+              request[i].requestEncoding != "" &&
+              request[i].requestValue != ""
             ) {
-              requestData[request[i].requestEncoding] = [];
-              requestData[request[i].requestEncoding][0] =
-                request[i].requestValue;
-            } else {
-              requestData[request[i].requestEncoding].push(
-                request[i].requestValue
-              );
+              if (
+                Object.keys(requestData).indexOf(request[i].requestEncoding) == -1
+              ) {
+                requestData[request[i].requestEncoding] = [];
+                requestData[request[i].requestEncoding][0] =
+                  request[i].requestValue;
+              } else {
+                requestData[request[i].requestEncoding].push(
+                  request[i].requestValue
+                );
+              }
             }
           }
         }
-      }
-      if(this.activeBtn == 0 || this.activeBtn == 2 || this.activeBtn == 3 || this.activeBtn == 4){
-        let requestHeader = this.$refs.fwcs_zhfw_qqtcs.getTableData();
-         for (let i = 0; i < requestHeader.length; i++) {
-          if (
-            requestHeader[i] &&
-            requestHeader[i].requestEncoding &&
-            requestHeader[i].requestValue &&
-            requestHeader[i].requestEncoding != "" &&
-            requestHeader[i].requestValue != ""
-          ) {
-            console.log(Object.keys(requestHeaderDataObj).indexOf(requestHeader[i].requestEncoding) == -1)
+        if(this.activeBtn == 0 || this.activeBtn == 2 || this.activeBtn == 3 || this.activeBtn == 4){
+          let requestHeader = this.$refs.fwcs_zhfw_qqtcs.getTableData();
+           for (let i = 0; i < requestHeader.length; i++) {
             if (
-              Object.keys(requestHeaderDataObj).indexOf(requestHeader[i].requestEncoding) == -1
+              requestHeader[i] &&
+              requestHeader[i].requestEncoding &&
+              requestHeader[i].requestValue &&
+              requestHeader[i].requestEncoding != "" &&
+              requestHeader[i].requestValue != ""
             ) {
-              requestHeaderDataObj[requestHeader[i].requestEncoding] = [];
-              requestHeaderDataObj[requestHeader[i].requestEncoding][0] = requestHeader[i].requestValue;
-            } else {
-              requestHeaderDataObj[requestHeader[i].requestEncoding].push(
-                requestHeader[i].requestValue
-              );
+              console.log(Object.keys(requestHeaderDataObj).indexOf(requestHeader[i].requestEncoding) == -1)
+              if (
+                Object.keys(requestHeaderDataObj).indexOf(requestHeader[i].requestEncoding) == -1
+              ) {
+                requestHeaderDataObj[requestHeader[i].requestEncoding] = [];
+                requestHeaderDataObj[requestHeader[i].requestEncoding][0] = requestHeader[i].requestValue;
+              } else {
+                requestHeaderDataObj[requestHeader[i].requestEncoding].push(
+                  requestHeader[i].requestValue
+                );
+              }
             }
           }
+          headers = Object.assign(headers, requestHeaderDataObj)
         }
-        headers = Object.assign(headers, requestHeaderDataObj)
-      }
-      let bodys = "";
-      let contentType = "";
-      if (this.activeBtn == 0 || this.activeBtn == 3) {
-        bodys = this.$refs.jsonCodes ? this.$refs.jsonCodes.getCodesVal() : "";
-        contentType = this.sjfwQqt;
-      } else if (this.activeBtn == 4) {
-        if (this.activeZh == "1") {
-          contentType = this.zhfwQqt;
-          if (this.zhfwQqt == "JSON") {
-            bodys = this.$refs.zhfwJsonCodes
-              ? this.$refs.zhfwJsonCodes.getCodesVal()
-              : "";
-          } else if (this.zhfwQqt == "form-data") {
-            let request = this.$refs.fwcs_zhfw_qq_form.getTableData().concat();
-            request.pop();
-            bodys = JSON.stringify(request);
-          } else if (this.zhfwQqt == "x-www-form-urlencoded") {
-            let request = this.$refs.fwcs_zhfw_www.getTableData().concat();
-            let arr = [];
-            request.pop();
-            request.forEach(item => {
-              arr.push({
-                key: item.requestEncoding,
-                val: item.requestValue,
-                field_type: "text"
+        let bodys = "";
+        let contentType = "";
+        if (this.activeBtn == 0 || this.activeBtn == 3) {
+          bodys = this.$refs.jsonCodes ? this.$refs.jsonCodes.getCodesVal() : "";
+          contentType = this.sjfwQqt;
+        } else if (this.activeBtn == 4) {
+          if (this.activeZh == "1") {
+            contentType = this.zhfwQqt;
+            if (this.zhfwQqt == "JSON") {
+              bodys = this.$refs.zhfwJsonCodes
+                ? this.$refs.zhfwJsonCodes.getCodesVal()
+                : "";
+            } else if (this.zhfwQqt == "form-data") {
+              let request = this.$refs.fwcs_zhfw_qq_form.getTableData().concat();
+              request.pop();
+              bodys = JSON.stringify(request);
+            } else if (this.zhfwQqt == "x-www-form-urlencoded") {
+              let request = this.$refs.fwcs_zhfw_www.getTableData().concat();
+              let arr = [];
+              request.pop();
+              request.forEach(item => {
+                arr.push({
+                  key: item.requestEncoding,
+                  val: item.requestValue,
+                  field_type: "text"
+                });
               });
-            });
-            bodys = JSON.stringify(arr);
+              bodys = JSON.stringify(arr);
+            }
           }
         }
       }
       let query = {
+        interface_typ: this.jkxy,
         method: this.select,
         url: this.serviceUrl,
         req_auth_mthod: this.sqfsVal,
@@ -1805,6 +1880,8 @@ export default {
                   }
                 }
                 let query = {
+                  interface_typ: this.jkxy,
+                  proxy_address: this.serviceUrl,
                   name: this.form.name,
                   sectors: this.form.area,
                   organization: this.form.origin,
@@ -1821,7 +1898,6 @@ export default {
                       ? this.zhyyVal
                       : 0,
                   portal_id: this.portal_id,
-                  encode_method: this.form.code,
                   doc_file: this.jkwds.length != 0 ? this.jkwds[0] : "",
                   urls: [
                     {
@@ -1832,7 +1908,7 @@ export default {
                       req_auth_token: this.sqfsVal == 1 ? this.tokenVal : "",
                       req_auth_token_name:
                         this.sqfsVal == 1 ? this.tokenName : "",
-                      method: this.select,
+                      method: this.jkxy == 1 ? this.select : '',
                       url: this.serviceUrl,
                       request_fields:
                         this.dataType == "body"
@@ -1847,6 +1923,9 @@ export default {
                     }
                   ]
                 };
+                if (this.jkxy == 1) {
+                  query.encode_method = this.form.code
+                }
                 this.$api.workbench.serviceAdd(query).then(response => {
                   this.fwR = false;
                   if (response.data.success == 1) {
@@ -1871,7 +1950,7 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           if (this.cover.length != 0) {
-            if (this.jkwds.length == 0) {
+            if (this.jkwds.length == 0 && this.jkxy == 1) {
               this.$message.error("请上传接口文档");
             } else {
               this.fwR = true;
@@ -1883,7 +1962,7 @@ export default {
                   req_auth_mthod: item.sqfsVal,
                   req_auth_token: item.sqfsVal == 1 ? item.tokenVal : "",
                   req_auth_token_name: item.sqfsVal == 1 ? item.tokenName : "",
-                  method: item.select,
+                  method: this.jkxy == 1 ? item.select : '',
                   url: item.serviceUrl,
                   request_fields:
                     item.dataType == "body"
@@ -1897,7 +1976,10 @@ export default {
                   content_type: "JSON"
                 });
               });
+              
               let query = {
+                interface_typ: this.jkxy,
+                proxy_address: this.jkxy == 1? '' : this.serviceUrl,
                 name: this.form.name,
                 sectors: this.form.area,
                 organization: this.form.origin,
@@ -1907,10 +1989,12 @@ export default {
                 data_service_type1: this.btnList[this.activeBtn].id,
                 data_service_type2: 24,
                 portal_id: this.portal_id,
-                encode_method: this.form.code,
                 urls: urls,
                 doc_file: this.jkwds.length != 0 ? this.jkwds[0] : ""
               };
+              if (this.jkxy == 1) {
+                  query.encode_method = this.form.code
+                }
               this.$api.workbench.serviceAdd(query).then(response => {
                 this.fwR = false;
                 if (response.data.success == 1) {