Merge branch 'ldx' into dev

src/pages/workbench/fwzc_fwcs.vue

@@ -214,7 +214,9 @@
         </div>
       </block-radius>
       <block-radius v-show="resultShow">
-        <div v-show="(activeBtn == 0 || activeBtn == 4 && zhyyVal == 0) && resSuccess">
+        <div
+          v-show="(activeBtn == 0 || activeBtn == 4 && (zhyyVal == 22 || zhyyVal == 23)) && resSuccess"
+        >
           <div class="sjfw_qqcstx">请求参数信息填写：</div>
           <ces-table
             ref="fwcs_sjfw_qqcs"
@@ -258,7 +260,7 @@
             headerCellClassName="th_pink"
           ></ces-table>
         </div>
-        <div v-show="(activeBtn == 1 || activeBtn == 4 && zhyyVal != 0) && 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">
@@ -471,10 +473,10 @@ export default {
       skfwQqt: "ArcGIS Server Web",
       skfwRadios: [],
       optionsZhyy: [
-        { label: "模型算法类", value: 0 },
-        { label: "查询验证类", value: 1 },
-        { label: "流程类", value: 2 },
-        { label: "应用类", value: 3 }
+        { label: "模型算法类", value: 22 },
+        { label: "查询验证类", value: 23 },
+        { label: "流程类", value: 24 },
+        { label: "应用类", value: 34 }
       ],
       zhyyVal: 0,
       jcxxtx: false,
@@ -672,7 +674,7 @@ export default {
       this.clickFwcs();
     },
     nextJcxx() {
-      if (activeBtn == 0 || (activeBtn == 4 && zhyyVal == 0)) {
+      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;