Merge branch 'ldx' into dev

src/pages/workbench/fwzc_fwcs.vue

@@ -260,7 +260,9 @@
             headerCellClassName="th_pink"
           ></ces-table>
         </div>
-        <div v-show="(activeBtn == 1 || activeBtn == 4 && (zhyyVal != 22 || zhyyVal != 23)) && resSuccess">
+        <div
+          v-show="(activeBtn == 1 || activeBtn == 4 && (zhyyVal != 22 || zhyyVal != 23)) && resSuccess"
+        >
           <div class="skfw_csfwxx">测试服务信息：</div>
           <div class="test_succ">
             <div class="skcs_jg">
@@ -470,7 +472,7 @@ export default {
       tokenVal: "",
       sjfwQqt: "JSON",
       zhfwQqt: "JSON",
-      skfwQqt: "ArcGIS Server Web",
+      skfwQqt: "",
       skfwRadios: [],
       optionsZhyy: [
         { label: "模型算法类", value: 22 },
@@ -478,7 +480,7 @@ export default {
         { label: "流程类", value: 24 },
         { label: "应用类", value: 34 }
       ],
-      zhyyVal: 0,
+      zhyyVal: 22,
       jcxxtx: false,
       form: {
         name: "",
@@ -645,7 +647,9 @@ export default {
         content_type: contentType,
         data_service_type1: this.btnList[this.activeBtn].id,
         data_service_type2:
-          this.activeBtn == 1
+          this.activeBtn == 0
+            ? 12
+            : this.activeBtn == 1
             ? this.skfwQqt
             : this.activeBtn == 4
             ? this.zhyyVal
@@ -674,7 +678,10 @@ export default {
       this.clickFwcs();
     },
     nextJcxx() {
-      if (this.activeBtn == 0 || (this.activeBtn == 4 && (this.zhyyVal == 22 || this.zhyyVal == 23))) {
+      if (
+        this.activeBtn == 0 ||
+        (this.activeBtn == 4 && (this.zhyyVal == 22 || this.zhyyVal == 23))
+      ) {
         let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
         let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
         this.requestRules = 0;
@@ -692,8 +699,8 @@ export default {
           this.$message.error("请完善返回参数信息中的字段名称");
         }
       } else {
-        this.request_fields = requestData;
-        this.response_fields = responseData;
+        this.request_fields = [];
+        this.response_fields = [];
         this.jcxxtx = true;
         this.getOrganization();
       }
@@ -758,7 +765,9 @@ export default {
               descript: this.form.desc,
               data_service_type1: this.btnList[this.activeBtn].id,
               data_service_type2:
-                this.activeBtn == 1
+                this.activeBtn == 0
+                  ? 12
+                  : this.activeBtn == 1
                   ? this.skfwQqt
                   : this.activeBtn == 4
                   ? this.zhyyVal
@@ -837,6 +846,7 @@ export default {
         if (response.data.success == 1) {
           this.btnList = response.data.data;
           this.skfwRadios = this.btnList[1].childDomains;
+          this.skfwQqt = this.skfwRadios[0].id;
           this.activeBtn = 0;
         } else {
           console.log(response.data.errMsg);