新增成功

src/server/api.js

@@ -63,7 +63,7 @@ default: // 默认环境下（开发环境）
   // BASE_URL = 'http://31.0.161.39/apiv2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
   // BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
-  BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
+  BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
   MOCK_URL = 'https://yapi.omniview.pro/mock/283'
   break

src/views/label/labelRightSide.vue

 <template>
   <div class="routerWapper">
 		<div>
-      <!-- {{triggerType}} - {{labelId}} - {{finish}} - {{jsonData}} - {{initKey}} -->
-      <!-- {{loopContent.data}} -->
-      <!-- {{loopContent}} -->
       <a-row>
         <!-- <a-col :span='1' v-if="triggerType == 'create'"> -->
         <a-col :span='1'>
@@ -64,6 +61,7 @@
       </a-form-item>
     </a-form>
     <!-- <div style="background-color: #F0F2F5; height: 10px; "></div> -->
+    {{loopContent}}
       <a-form :form='infoSettingForm' layout='inline'>
         <div v-for="(item66, index66) in loopContent" :key="index66" style="margin-top: 20px; padding: 20px; border: 1px solid lightgrey">
           <a-row type='flex' style="font-weight: bold; font-size: 16px; margin-bottom: 20px; border-bottom: 1px solid lightgrey" align='middle'>
@@ -78,15 +76,21 @@
             <!-- <span v-if="index66 !== 'data'">与</span> -->
             <!-- {{item66}} -->
             <div v-for="(item, index) in item66" :key='index' style="margin-bottom: 20px">
-              <a-form-item v-if="!!item.relation">
+              <!-- <a-form-item v-if="!!item.relation">
                 <a-select style="width: 120px" placeholder='请选择条件' v-decorator="['relation-' + index66 +'-' + index,{initialValue: item.relation, validateTrigger:'blur',rules: []}]">
                   <a-select-option value='and'>与</a-select-option>
                   <a-select-option value='or'>或</a-select-option>
                   <a-select-option value='ne'>非</a-select-option>
                 </a-select>
-              </a-form-item>
+              </a-form-item> -->
 
-              <a-form-item v-else style="margin-left: 120px"></a-form-item>
+              <a-form-item>
+                <a-select style="width: 120px" placeholder='请选择条件' v-decorator="['relation-' + index66 +'-' + index,{initialValue: item.relation, validateTrigger:'blur',rules: []}]">
+                  <a-select-option value='and'>与</a-select-option>
+                  <a-select-option value='or'>或</a-select-option>
+                  <a-select-option value='ne'>非</a-select-option>
+                </a-select>
+              </a-form-item>
 
               <a-form-item>
                 <a-select style="width: 120px" placeholder='请选择业务属性' v-decorator="['key-' + index66 +'-' + index,{initialValue: item.key, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
@@ -123,6 +127,8 @@
                 <a-icon v-if="index+1 == loopContent.data.length" theme='filled' style="color:red; margin-left: 5px" type="minus-circle" @click="deleteRow(index66, index)" />
               </a-form-item> -->
               <a-form-item>
+                {{index66}}
+                {{index + 1}}
                 <a-icon v-if="index+1 == loopContent.data.length" theme='filled' style="color:lightgreen;" type="plus-circle" @click="addRow(index66)" />
                 <a-icon v-if="index+1 == loopContent.data.length" theme='filled' style="color:red; margin-left: 5px" type="minus-circle" @click="deleteRow(index66, index)" />
               </a-form-item>
@@ -225,6 +231,7 @@ export default {
     console.log('得到的' + this.labelId)
     this.getLabelDetail()
     this.getParentLabelList()
+    // this.getKeyList()
     // this.initKeyList()
   },
   props: [
@@ -292,19 +299,12 @@ export default {
       this.$ajax.get({
         url: this.$api.GET_AVAILABLE_KEY_LIST,
         params: {
-          'tableName': val
+          pageNo: 1,
+          pageSize: 999
         }
       }).then(res => {
         if (res.code == 200) {
-          let list = res.data.content
-          console.log(list)
-          this.availableKeyList = []
-          for(let i = 0; i < list.length; i++) {
-            this.availableKeyList.push({
-              'tblKey': list[i].tblKey,
-              'tblKeyName': list[i].tblKeyName
-            })
-          }
+          this.availableKeyList = res.data.content
         }
       })
     },
@@ -321,7 +321,8 @@ export default {
             })
             this.labelNameForDel = res.data.content.labelName
             this.loopContent.data = res.data.content.selParams
-            console.log(res.data.content.selParams)
+
+            console.log(this.loopContent.data)
             this.initKeyList()
           }
         })
@@ -388,6 +389,7 @@ export default {
       // console.log(JSON.stringify(this.loopContent.data))
     },
     deleteLabel(id) {
+      console.log(id)
       // 查询该标签是否是一级标签，是一级标签直接删除。
       this.deleteVisible = !this.deleteVisible
     },