Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/pages/workbench/fwzc_fwcs.vue

@@ -27,9 +27,9 @@
           <el-select @change="changeZhType" v-model="zhyyVal" placeholder="请选择" class="zhyy_select">
             <el-option
               v-for="item in optionsZhyy"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             ></el-option>
           </el-select>
         </div>
@@ -365,6 +365,7 @@
       :title="dialogInfo.title"
       :msg="dialogInfo.msg"
       :submit="dialogInfo.submit"
+      :cancelHide="true"
     ></apass-dialog>
   </div>
 </template>
@@ -495,12 +496,7 @@ export default {
       zhfwQqt: "JSON",
       skfwQqt: "",
       skfwRadios: [],
-      optionsZhyy: [
-        { label: "模型算法类", value: 22 },
-        { label: "查询验证类", value: 23 },
-        { label: "流程类", value: 24 },
-        { label: "应用类", value: 34 },
-      ],
+      optionsZhyy: [],
       zhyyVal: 22,
       jcxxtx: false,
       form: {
@@ -964,6 +960,7 @@ export default {
           this.btnList = response.data.data;
           this.skfwRadios = this.btnList[1].childDomains;
           this.skfwQqt = this.skfwRadios[0].id;
+          this.optionsZhyy = this.btnList[4].childDomains;
           this.activeBtn = 0;
         } else {
           console.log(response.data.errMsg);
@@ -1001,6 +998,7 @@ export default {
         this.getOrganization();
       } else {
         self.is_map = 0;
+        self.getServiceType1();
       }
     },
     goBack() {
@@ -1081,7 +1079,6 @@ export default {
       }
     });
     self.judgeMap();
-    self.getServiceType1();
     self.getArea();
   },
 };