From 12871e8d23e3d2c7a773b2b21a331977494adf0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Mon, 26 Oct 2020 12:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B5=8B=E8=AF=95=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/imgs/home_tool_ic_sscj.png  | Bin 0 -> 1315 bytes
 src/components/general/upload_file.vue |  20 +-
 src/pages/workbench/fwzc_fwcs.vue      | 300 +++++++++++++++----------
 src/pages/workbench/workPlace.vue      |   8 +
 4 files changed, 200 insertions(+), 128 deletions(-)
 create mode 100644 src/assets/imgs/home_tool_ic_sscj.png

diff --git a/src/assets/imgs/home_tool_ic_sscj.png b/src/assets/imgs/home_tool_ic_sscj.png
new file mode 100644
index 0000000000000000000000000000000000000000..437816487b3b7dc35b4bfaf62462c306f80c5515
GIT binary patch
literal 1315
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>;wPOe~$<Obrapjhzh*U7eiFEX<sY-JD!q
z&0Gx4UEN@MUGkGlb5rw5V0u#!dJS>v1*L`D0-((<sYRJ(sVQzn`MC;UKU-zubc=~A
zPV=C8Q*gS)#0{rjeV}9XK{1OI(=Z`m@&Pg7=@!U=r~K4BU~(@4rfb7Wr&I<8#%Z1|
zjv*Dd)=b%}&k`td^gfSd%T3i)p#iIETH0Jxto|`LDLF0-&?wy^VkNlMsZrOYrE8Mc
zi7*ux6{USi*WFTBAIDfujyZoOB=3`V*}Z#~@9z~qw|!oxw>hC_CS$4sL!`l(`-wdb
zq5;|e+ys3r1%55?VEl1__45O<oM!D09Ip;qR|G4C9uPJZ<kC>uJ-5MZ>I~+!t9DsU
z2>-wQKy$}VpHG^X&a@O3a7nE-`*iKIcf>+(|Cq2K&b|XtN4yii6fTb28{wCn?r5sf
zSo}d!`B8)Iub>Ohx&ydpq*N<yVf>cda-=P9TTNp47H+94w<J!?_+g>8|IpG72{Xnx
zN7mX`ET%F|dAaS`k<l;Wo%Su3UcFT)`Zm*B6O#bZnH~O0x^lcOGycxmP}y!|z5ML7
zcGc`ZYKec^3m?a`J8MPuyz`W(x6fdj{_O|*L2>QL%9mK(lKplaalEqVbWyj-x1QIl
zZH%sm?bDt2i1$PAM45JzyWeLnSTESA9;aMhc)cTJ%ZejQcKOcRn|jYx=<=Nt$#EUx
eaXI&yco?3&PnCZ8ReL3<*z$Dsb6Mw<&;$SiBhTUh

literal 0
HcmV?d00001

diff --git a/src/components/general/upload_file.vue b/src/components/general/upload_file.vue
index 4cc80c2..a30354a 100644
--- a/src/components/general/upload_file.vue
+++ b/src/components/general/upload_file.vue
@@ -114,6 +114,19 @@ export default {
   },
   watch: {
     list(value) {
+      this.getFileArray(value);
+    },
+  },
+  created() {
+    if (!this.unique) {
+      this.anotherData.uniqueCode = this.unique;
+    }
+  },
+  mounted() {
+    this.getFileArray(this.list);
+  },
+  methods: {
+    getFileArray(value) {
       var getListImg = [];
       if (value && value.length != 0) {
         for (var i = 0; i < value.length; i++) {
@@ -126,13 +139,6 @@ export default {
       this.fileArray = [...getListImg];
       this.hideUpload = this.fileArray.length >= this.max;
     },
-  },
-  created() {
-    if (!this.unique) {
-      this.anotherData.uniqueCode = this.unique;
-    }
-  },
-  methods: {
     beforeAvatarUpload(file) {
       if (this.type == "mp3") {
         const isMP3 = file.type === "audio/mp3";
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index 7dc225a..f37d98b 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="fwcs">
     <el-breadcrumb v-if="is_map != 0" separator="/" class="bread_crumb">
-      <el-breadcrumb-item :to="{ path: '/workplace' }"
-        >在线组件工具</el-breadcrumb-item
-      >
-      <el-breadcrumb-item :to="{ path: '/intelligent_drawing' }"
-        >智能制图</el-breadcrumb-item
-      >
+      <el-breadcrumb-item :to="{ path: '/workplace' }">
+        在线组件工具
+      </el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/intelligent_drawing' }">
+        智能制图
+      </el-breadcrumb-item>
       <el-breadcrumb-item>发布信息填写</el-breadcrumb-item>
     </el-breadcrumb>
     <el-breadcrumb
@@ -14,12 +14,12 @@
       separator="/"
       class="bread_crumb"
     >
-      <el-breadcrumb-item :to="{ path: '/workplace' }"
-        >在线组件工具</el-breadcrumb-item
-      >
-      <el-breadcrumb-item :to="{ path: '/progress/designer' }"
-        >流程设计</el-breadcrumb-item
-      >
+      <el-breadcrumb-item :to="{ path: '/workplace' }">
+        在线组件工具
+      </el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/progress/designer' }">
+        流程设计
+      </el-breadcrumb-item>
       <el-breadcrumb-item>发布信息填写</el-breadcrumb-item>
     </el-breadcrumb>
     <el-breadcrumb v-else separator="/" class="bread_crumb">
@@ -80,7 +80,7 @@
             （用于查询流程状态）
           </p>
         </div>
-        <div v-if="(activeBtn == 4 && zhyyVal == 24) || activeBtn == 3">
+        <div v-show="(activeBtn == 4 && zhyyVal == 24) || activeBtn == 3">
           <div class="fwcs_fwdz">
             上传接口文档
             <span class="title_bc">（请上传所有服务地址完整接口文档）</span>：
@@ -96,13 +96,14 @@
             class="lc_upf"
             up_fz="支持.pdf，.docx，.doc，.zip，.rar 格式文件"
             accepts=".pdf, .docx, .doc, .zip, .rar"
+            :list="jkwds"
           ></upload-file>
         </div>
         <div v-if="activeBtn == 3">
           <div class="fwcs_fwdz">返回数据格式</div>
           <el-radio-group v-model="gz_fhsjgs" class="gz_fhsjgs_rad">
             <el-radio label="JSON">JSON</el-radio>
-            <el-radio label="XML">XML</el-radio>
+            <el-radio label="xml">XML</el-radio>
           </el-radio-group>
         </div>
         <div v-if="!(activeBtn == 4 && zhyyVal == 24)" class="fwcs_fwdz">
@@ -142,9 +143,9 @@
               ></el-option>
             </el-select>
           </el-input>
-          <el-button @click="clickFwcs()" class="fwcs_btn_fwcs"
-            >服务测试</el-button
-          >
+          <el-button @click="clickFwcs()" class="fwcs_btn_fwcs">
+            服务测试
+          </el-button>
         </div>
         <div v-if="activeBtn == 0 || activeBtn == 3">
           <el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
@@ -177,7 +178,10 @@
                   <el-radio label="JSON">JSON</el-radio>
                 </el-radio-group>
               </div>
-              <v-apaas-code ref="jsonCodes"></v-apaas-code>
+              <v-apaas-code
+                :key="'code' + code_1_index"
+                ref="jsonCodes"
+              ></v-apaas-code>
             </el-tab-pane>
             <el-tab-pane label="授权信息" name="2">
               <el-row class="sqxx_row">
@@ -258,7 +262,10 @@
                 </el-radio-group>
               </div>
               <div v-show="zhfwQqt == 'JSON'">
-                <v-apaas-code ref="zhfwJsonCodes"></v-apaas-code>
+                <v-apaas-code
+                  :key="'code' + code_2_index"
+                  ref="zhfwJsonCodes"
+                ></v-apaas-code>
               </div>
               <div v-show="zhfwQqt == 'form-data'">
                 <ces-table
@@ -500,7 +507,10 @@
                     <el-radio label="JSON">JSON</el-radio>
                   </el-radio-group>
                 </div>
-                <v-apaas-code :ref="`one_json_${indexOne}`"></v-apaas-code>
+                <v-apaas-code
+                  :key="'code' + indexOne"
+                  :ref="`one_json_${indexOne}`"
+                ></v-apaas-code>
               </el-tab-pane>
               <el-tab-pane label="授权信息" name="2">
                 <el-row class="sqxx_row">
@@ -979,6 +989,8 @@ export default {
       dataType: "",
       jkwds: [],
       gz_fhsjgs: "JSON",
+      code_1_index: 0,
+      code_2_index: 0,
     };
   },
   computed: {},
@@ -999,6 +1011,40 @@ export default {
       this.select = "GET";
       this.serviceUrl = "";
       this.noSearchUrl = "";
+      this.gz_fhsjgs = "JSON";
+      this.zhyyVal = "";
+      this.datasSj = [];
+      this.tokenVal = "";
+      this.datasZh = [];
+      this.zhfwQqt = "JSON";
+      this.datasZhForm = [];
+      this.datasZhwww = [];
+      this.liucheng_list = [
+        {
+          one_input: "",
+          select: "GET",
+          serviceUrl: "",
+          datasSj: [],
+          sjfwQqt: "JSON",
+          sqfsVal: "",
+          tokenVal: "",
+          noSearchUrl: "",
+          resultShow: false,
+          resSuccess: false,
+          requestRules: 0,
+          responseRules: 0,
+          request_fields: [],
+          response_fields: [],
+          checkPass: false,
+          dataType: "",
+          body_fields: [],
+          param_fields: [],
+        },
+      ];
+      this.activeName = "0";
+      this.code_1_index += 1;
+      this.code_2_index += 1;
+      this.jkwds = [];
     },
     getUrl(enUrl) {
       let url = decodeURI(enUrl);
@@ -1019,7 +1065,7 @@ export default {
         this.noSearchUrl = enUrl;
       }
       this.serviceUrl = url;
-      if (this.activeBtn == 0) {
+      if (this.activeBtn == 0 || this.activeBtn == 3) {
         this.datasSj = arr;
       } else if (this.activeBtn == 4) {
         this.datasZh = arr;
@@ -1153,21 +1199,30 @@ export default {
         this.activeBtn == 3 ||
         (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;
-        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("请完善返回参数信息中的字段名称");
+        if (
+          this.activeBtn == 3 ||
+          (this.activeBtn == 4 && this.zhyyVal == 22)
+        ) {
+          if (this.jkwds.length == 0) {
+            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) {
         let value = helper.getQueryString("id", this.serviceUrl);
@@ -1334,77 +1389,79 @@ export default {
       }
     },
     registePt() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          if (this.cover.length != 0) {
-            let contentType = "";
-            if (this.activeBtn == 1 && !this.is_portal) {
-              this.addPortalItem();
-            } else {
-              if (this.activeBtn == 0 || this.activeBtn == 3) {
-                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,
-                organization: this.form.origin,
-                cover: this.cover[0],
-                openness: this.form.resource,
-                descript: this.form.desc,
-                data_service_type1: this.btnList[this.activeBtn].id,
-                data_service_type2:
-                  this.activeBtn == 0
-                    ? 12
-                    : this.activeBtn == 1
-                    ? this.skfwQqt
-                    : this.activeBtn == 4
-                    ? this.zhyyVal
-                    : 0,
-                portal_id: this.portal_id,
-                encode_method: this.form.code,
-                urls: [
-                  {
-                    name: "",
-                    response_type:
-                      this.activeBtn == 3 ? this.gz_fhsjgs : "JSON",
-                    req_auth_mthod: 0,
-                    req_auth_token: this.tokenVal,
-                    method: this.select,
-                    url: this.serviceUrl,
-                    request_fields:
-                      this.dataType == "body"
-                        ? this.request_fields
-                        : this.body_fields,
-                    request_query_fields:
-                      this.dataType == "param"
-                        ? this.request_fields
-                        : this.param_fields,
-                    response_fields: this.response_fields,
-                    content_type: contentType,
-                  },
-                ],
-              };
-              this.$api.workbench.serviceAdd(query).then((response) => {
-                if (response.data.success == 1) {
-                  this.$message.success("服务注册成功");
-                  this.$router.push("/fwgl/" + this.$store.getters.level);
-                } else {
-                  console.log(response.data.errMsg);
-                  this.$message.error(response.data.errMsg);
-                }
-              });
-            }
-          } else {
-            this.$message.error("请上传服务封面");
-          }
-        } else {
-          this.$message.error("请完善服务基本信息");
-        }
-      });
+      console.log(this.jkwds);
+      // this.$refs.form.validate((valid) => {
+      //   if (valid) {
+      //     if (this.cover.length != 0) {
+      //       let contentType = "";
+      //       if (this.activeBtn == 1 && !this.is_portal) {
+      //         this.addPortalItem();
+      //       } else {
+      //         if (this.activeBtn == 0 || this.activeBtn == 3) {
+      //           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,
+      //           organization: this.form.origin,
+      //           cover: this.cover[0],
+      //           openness: this.form.resource,
+      //           descript: this.form.desc,
+      //           data_service_type1: this.btnList[this.activeBtn].id,
+      //           data_service_type2:
+      //             this.activeBtn == 0
+      //               ? 12
+      //               : this.activeBtn == 1
+      //               ? this.skfwQqt
+      //               : this.activeBtn == 4
+      //               ? this.zhyyVal
+      //               : 0,
+      //           portal_id: this.portal_id,
+      //           encode_method: this.form.code,
+      //           doc_file: this.jkwds.length != 0 ? this.jkwds[0] : "",
+      //           urls: [
+      //             {
+      //               name: "",
+      //               response_type:
+      //                 this.activeBtn == 3 ? this.gz_fhsjgs : "JSON",
+      //               req_auth_mthod: 0,
+      //               req_auth_token: this.tokenVal,
+      //               method: this.select,
+      //               url: this.serviceUrl,
+      //               request_fields:
+      //                 this.dataType == "body"
+      //                   ? this.request_fields
+      //                   : this.body_fields,
+      //               request_query_fields:
+      //                 this.dataType == "param"
+      //                   ? this.request_fields
+      //                   : this.param_fields,
+      //               response_fields: this.response_fields,
+      //               content_type: contentType,
+      //             },
+      //           ],
+      //         };
+      //         this.$api.workbench.serviceAdd(query).then((response) => {
+      //           if (response.data.success == 1) {
+      //             this.$message.success("服务注册成功");
+      //             this.$router.push("/fwgl/" + this.$store.getters.level);
+      //           } else {
+      //             console.log(response.data.errMsg);
+      //             this.$message.error(response.data.errMsg);
+      //           }
+      //         });
+      //       }
+      //     } else {
+      //       this.$message.error("请上传服务封面");
+      //     }
+      //   } else {
+      //     this.$message.error("请完善服务基本信息");
+      //   }
+      // });
     },
     registeOne() {
       this.$refs.form.validate((valid) => {
@@ -1593,14 +1650,20 @@ export default {
         //   id: self.portal_id,
         // });
         // this.$router.push("/intelligent_drawing");
-        if(self.is_map == 1){
-          let shareWebMapParam =JSON.parse(window.sessionStorage.getItem('shareWebMapParam'))
-          window.location.href = '/vmap/#/map'+`?id=${shareWebMapParam.portalid}`
-        }else if(self.is_map == 4){
+        if (self.is_map == 1) {
+          let shareWebMapParam = JSON.parse(
+            window.sessionStorage.getItem("shareWebMapParam")
+          );
+          window.location.href =
+            "/vmap/#/map" + `?id=${shareWebMapParam.portalid}`;
+        } else if (self.is_map == 4) {
           self.$router.back(-1);
-        }else{
-          let shareWebMapParam =JSON.parse(window.sessionStorage.getItem('shareWebMapParam'))
-          window.location.href = '/vmap/#/map'+`?id=${shareWebMapParam.portalid}`
+        } else {
+          let shareWebMapParam = JSON.parse(
+            window.sessionStorage.getItem("shareWebMapParam")
+          );
+          window.location.href =
+            "/vmap/#/map" + `?id=${shareWebMapParam.portalid}`;
         }
       } else if (type == "process") {
         this.$router.push("/progress/designer");
@@ -1794,7 +1857,6 @@ export default {
       let headers = {};
       let requestData = {};
       let dataOne = this.liucheng_list[indexOne];
-      console.log(dataOne);
       if (dataOne.sqfsVal != "") {
         headers.Authorization = [];
         headers.Authorization[0] = dataOne.sqfsVal + " " + dataOne.tokenVal;
@@ -1823,12 +1885,8 @@ export default {
       }
       let bodys = "";
       let contentType = "";
-      if (this.activeBtn == 0) {
-        bodys = this.$refs["one_json_" + indexOne][0]
-          ? this.$refs["one_json_" + indexOne][0].getCodesVal()
-          : "";
-        contentType = dataOne.sjfwQqt;
-      }
+      bodys = this.$refs["one_json_" + indexOne][0].getCodesVal();
+      contentType = dataOne.sjfwQqt;
       let query = {
         method: dataOne.select,
         url: dataOne.serviceUrl,
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 823d5c4..68fa405 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -1004,6 +1004,14 @@ export default {
           color: "#58617a",
           url:'/search_engine',
         },
+        {
+          text: "数据采集",
+          pic: require("@/assets/imgs/home_tool_ic_sscj.png"),
+          bg: "#fff2e2",
+          color: "#ea7d19",
+          url:'https://apaas3.wodcloud.com/sjcj/ui/',
+          target: 1,
+        },
       ],
       service_arr: [
         ["服务列表", "申请服务", "云资源"],
-- 
2.26.0