Merge branch 'ldx' into dev

src/pages/workbench/fwzc_fwcs.vue

@@ -36,7 +36,15 @@
             v-model="serviceUrl"
             class="input-with-select"
           >
-            <el-select v-model="select" slot="prepend" placeholder="请选择">
+            <el-select v-if="activeBtn == 1" v-model="select" slot="prepend" placeholder="请选择">
+              <el-option
+                v-for="item in optionType1"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <el-select v-else v-model="select" slot="prepend" placeholder="请选择">
               <el-option
                 v-for="item in optionType"
                 :key="item.value"
@@ -114,7 +122,7 @@
             <el-radio
               v-for="item in skfwRadios"
               :key="item"
-              v-model="sjfwQqt"
+              v-model="skfwQqt"
               :label="item"
             >{{ item }}</el-radio>
             <el-button v-if="activeBtn == 1" @click="clickFwcs()" class="fwcs_btn_fwcs">服务测试</el-button>
@@ -363,6 +371,9 @@ export default {
         { label: "PUT", value: "PUT" },
         { label: "DELETE", value: "DELETE" }
       ],
+      optionType1: [
+        { label: "GET", value: "GET" },
+      ],
       activeName: 0,
       activeZh: 0,
       sjfwQqcs: [
@@ -459,6 +470,7 @@ export default {
       tokenVal: "",
       sjfwQqt: "JSON",
       zhfwQqt: "JSON",
+      skfwQqt: "ArcGIS Server Web",
       skfwRadios: [
         "ArcGIS Server Web",
         "文档",
@@ -636,7 +648,14 @@ export default {
         headers: headers,
         params: requestData,
         body: bodys,
-        content_type: contentType
+        content_type: contentType,
+        data_service_type1: this.btnList[this.activeBtn].id,
+        data_service_type2:
+          this.activeBtn == 1
+            ? this.skfwQqt
+            : this.activeBtn == 4
+            ? this.zhyyVal
+            : 0
       };
       this.$api.workbench.fwzcFwcs(query).then(response => {
         if (response.data.success == 1) {
@@ -721,6 +740,15 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           if (this.cover.length != 0) {
+            let contentType = "";
+            if (this.activeBtn == 0) {
+              bodys = this.$refs.jsonCodes.getCodesVal();
+              contentType = this.sjfwQqt;
+            } else if (this.activeBtn == 4) {
+              if (this.activeZh == 1) {
+                contentType = this.zhfwQqt;
+              }
+            }
             let query = {
               name: this.form.name,
               sectors: this.form.area,
@@ -731,7 +759,7 @@ export default {
               data_service_type1: this.btnList[this.activeBtn].id,
               data_service_type2:
                 this.activeBtn == 1
-                  ? this.skfwRadios
+                  ? this.skfwQqt
                   : this.activeBtn == 4
                   ? this.zhyyVal
                   : 0,
@@ -739,7 +767,8 @@ export default {
               method: this.select,
               url: this.serviceUrl,
               request_fields: this.request_fields,
-              response_fields: this.response_fields
+              response_fields: this.response_fields,
+              content_type: contentType
             };
             this.$api.workbench.serviceAdd(query).then(response => {
               if (response.data.success == 1) {