标签截止03.17

src/views/houseData/basicInfoByLabel.vue

@@ -2,29 +2,19 @@
 <template>
   <div class="routerWapper">
     <!-- {{checkedKeys}} -->
-    <a-row type='flex'>
-      <a-col flex='250px' style="overflow: hidden">
-        <div v-if="$route.path == '/houseData/basicInfoByLabel'" class="layoutMargin layoutPadding" style="height: 100%">
-          <!-- <a-row style="font-weight: bold">标签筛选条件</a-row>
-          <a-divider /> -->
+    <div class="layoutMargin layoutPadding">
+    <a-row>
+        <a-col :span="4" style="height:100%; position:relative">
+          <span style="display: block; width: 90%; color:#1890ff; font-size: 16px; font-weight: 500; padding-bottom:5px; border-bottom:1px solid #1890ff;">标签筛选条件</span>
           <a-tree
             @check='onCheck'
             checkable
             :tree-data="treeData"
             :replace-fields="replaceFields"
           />
-          <!-- <a-tree
-            v-model='checkedKeys'
-            checkable
-            :tree-data="treeData"
-            :replace-fields="replaceFields"
-            :selected-keys="selectedKeys"
-            @select="onSelect"
-          /> -->
-        </div>
         </a-col>
-      <a-col flex='78%'>
-        <div v-if="$route.path == '/houseData/basicInfoByLabel'" class="layoutMargin layoutPadding">
+        <a-col :span="17" style="padding-left: 10px; border-left:1px solid #ccc;">
+          <!-- <div v-if="$route.path == '/houseData/basicInfoByLabel'" class="layoutMargin layoutPadding"> -->
             <a-form :form="form" class="protalForm" >
               <a-row class="formItem" type="flex" :justify="simpleSearchForm ? 'end' : ''" align="top" :gutter="simpleSearchForm ? 16 : 0">
                 <a-col span="8">
@@ -176,11 +166,12 @@
           <div class="portalTableOperates">
             <tableAndMut ref="childTab" :tableData="tableData" :pagination="pagination" :tbl="tbl" />
           </div>
-        </div>
-        <RouterWapper v-else></RouterWapper>
+        <!-- </div> -->
+        <!-- <RouterWapper v-else></RouterWapper> -->
         </a-col>
     </a-row>
     </div>
+  </div>
 </template>
 
 <script>

src/views/label/labelList.vue

@@ -8,7 +8,27 @@
 				<a-button @click="backPage"> 返回 </a-button>
 			</div>
 		</div>
-    <div v-if="$route.name=='lvot'">
+    <div class="layoutMargin layoutPadding" v-if="$route.name == 'lvot'">
+      <a-row v-if="$route.name=='lvot'">
+          <a-col :span="4" style="border-right:1px solid #ccc;height:100%; position:relative">
+            <span style="display: block; width: 90%; color:#1890ff; font-size: 16px; font-weight: 500; padding-bottom:5px;"><a-button style="width: 100%" size='medium' type="default" @click="addLabel"> <a-icon type="plus" />添加标签 </a-button></span>
+            <a-tree
+              style="height: 700px"
+              :tree-data="treeData"
+              :replace-fields="replaceFields"
+              :selected-keys="selectedKeys"
+              @select="onSelect"
+            />
+          </a-col>
+          <a-col :span="17" :offset="1">
+            <RightPanel v-if="currentState == 'create'" :trigger-type='currentState' @finish='getFinishState' />
+            <RightPanel v-else-if="currentState == 'loadChildLabel'" :trigger-type='currentState' :label-id='labelId' @finish='getFinishState' />
+            <ParentRightPanel v-else-if="currentState == 'loadParentLabel'" :trigger-type='currentState' :label-id='labelId' @finish='getFinishState' />
+            <EmptyRightPanel v-else />
+          </a-col>
+      </a-row>
+    </div>
+    <!-- <div v-if="$route.name=='lvot'">
       <a-row>
         <a-col :span='4' class="layoutMargin layoutPadding" style="height: 680px">
           <a-row style="height: 36px">
@@ -29,7 +49,7 @@
           <EmptyRightPanel v-else />
         </a-col>
       </a-row>
-    </div>
+    </div> -->
     <RouterWapper v-else />
   </div>
 </template>

src/views/label/labelRightSide.vue

@@ -116,8 +116,9 @@
     <a-modal :visible='deleteVisible' @ok='handleDeleteOk' @cancel='handleCancelOk'>
       确定删除标签【{{labelNameForDel}}】吗?
     </a-modal>
-    <a-modal width='800px' :bordered='true' :title='`搜索到`+resultList.length + `条结果，确认保存吗？`' :visible='confirmVisible' @ok='handleConfirmVisible' @cancel='handleConfirmCancel'>
-      <a-table class="portalTable" size="small" row-key="id" :columns="columns" :dataSource="resultList"></a-table>
+    <a-modal width='400px' :bordered='true' title='提示' :visible='confirmVisible' @ok='handleConfirmVisible' @cancel='handleConfirmCancel'>
+      确定保存吗？
+      <!-- <a-table class="portalTable" size="small" row-key="id" :columns="columns" :dataSource="resultList"></a-table> -->
     </a-modal>
   </div>
 </template>
@@ -419,28 +420,30 @@ export default {
                   })
                 }
 
-                this.$ajax.post({
-                  url: this.$api.GET_LABEL_BIND_FILTER_RESULT,
-                  params: this.jsonData
-                }).then(res => {
-                  if (res.code == 200) {
-                    if(res.data == null) {
-                      console.log(1)
-                      this.$message.error('该标签无搜索结果，标签添加失败！')
-                    } else if(!!res.data.content) {
-                      if(res.data.content.length > 0) {
-                        this.resultList = res.data.content
+                // this.$ajax.post({
+                //   url: this.$api.GET_LABEL_BIND_FILTER_RESULT,
+                //   params: this.jsonData
+                // }).then(res => {
+                //   if (res.code == 200) {
+                //     if(res.data == null) {
+                //       console.log(1)
+                //       this.$message.error('该标签无搜索结果，标签添加失败！')
+                //     } else if(!!res.data.content) {
+                //       if(res.data.content.length > 0) {
+                //         this.resultList = res.data.content
+                //         this.confirmVisible = !this.confirmVisible
+                //       } else {
+                //         console.log(2)
+                //         this.$message.error('该标签无搜索结果，标签添加失败！')
+                //       }
+                //     } else {
+                //     }
+                //   } else {
+                //     this.$message.error('接口报错，报错码 ' + res.code + ', 请稍后重试！')
+                //   }
+                // })
+                // this.resultList = res.data.content
                 this.confirmVisible = !this.confirmVisible
-                      } else {
-                        console.log(2)
-                        this.$message.error('该标签无搜索结果，标签添加失败！')
-                      }
-                    } else {
-                    }
-                  } else {
-                    this.$message.error('接口报错，报错码 ' + res.code + ', 请稍后重试！')
-                  }
-                })
               }
             })
           }