123

src/router/routes.js

@@ -57,6 +57,10 @@ const appRoutes = [
         path: '/house', name: 'house', component: resolve => require(['@/components/Layout/content-wrapper'], resolve), // ContentWrapper,
         meta: { title: '住宅信息', menuPath: true, menuIcon: 'profile', hideInBread: true, requirePerm: false },
         children: [ 
+          {
+            path: '/houseData/basicInfoByLabel', name: 'basicInfoByLabel', component: resolve => require(['@/views/houseData/basicInfoByLabel'], resolve), //basicInfo,
+            meta: { title: '小区列表-标签', menuPath: true, hideInBread: false, },
+          },
           { // 小区列表
             path: '/houseData/basicInfo', name: 'basicInfo', component: resolve => require(['@/views/houseData/basicInfo'], resolve), //basicInfo,
             meta: { title: '小区列表', menuPath: true, hideInBread: false, },

src/views/label/labelRightSide.vue

@@ -20,25 +20,27 @@
     </div>
     <a-divider type='horizontal' />
     <a-form :form='labelForm'>
-      <a-form-item label='标签名' :label-col="{span:2}" :wrapper-col="{span:14}">
-        <a-input v-decorator="['labelName',{validateTrigger:'blur', initialValue: jsonData.labelName?jsonData.labelName: '', rules: [{required: true, message: '请填写标签名！'}]}]"></a-input>
+      <a-form-item label='标签名' :label-col="{span:3}" :wrapper-col="{span:15}">
+        <a-input placeholder='请输入标签名' v-decorator="['labelName',{validateTrigger:'blur', initialValue: jsonData.labelName?jsonData.labelName: '', rules: [{required: true, message: '请填写标签名！'}]}]"></a-input>
       </a-form-item>
-      <a-form-item label='标签分组' :label-col="{span:2}" :wrapper-col="{span:14}">
+      <a-form-item label='标签分组' :label-col="{span:3}" :wrapper-col="{span:7}">
         <a-select v-decorator="['parentId',{validateTrigger:'blur', initialValue: jsonData.parentId?jsonData.parentId: '0', rules: []}]">
           <a-select-option value='0'>无（将改标签设为一级标签）</a-select-option>
           <a-select-option v-for="(item, index) in parentLabelList" :key='index' :value='item.id'>
             {{item.labelName}}
           </a-select-option>
         </a-select>
+        <!-- <a-input placeholder='请输入分组名称' v-decorator="['parentName',{validateTrigger:'blur', initialValue: jsonData.parentName?jsonData.parentName: '', rules: [{required: true, message: '请填写标签分组名！'}]}]"></a-input> -->
       </a-form-item>
-      <a-form-item label='业务对象' :label-col="{span:2}" :wrapper-col="{span:14}">
-        <a-select :disabled="triggerType == 'loadChildLabel'" @change='handleObjChange' v-decorator="['tableName',{validateTrigger:'blur', initialValue: jsonData.tableName?jsonData.tableName: '', rules: [{required: true, message: '请选择业务对象！'}]}]">
+      <a-form-item label='业务对象' :label-col="{span:3}" :wrapper-col="{span:15}">
+        <a-select placeholder='请选择业务对象' :disabled="triggerType == 'loadChildLabel'" @change='handleObjChange' v-decorator="['tableName',{validateTrigger:'blur', initialValue: jsonData.tableName?jsonData.tableName: '', rules: [{required: true, message: '请选择业务对象！'}]}]">
           <a-select-option value='tbl_community'>小区</a-select-option>
           <a-select-option value='tbl_building'>门牌幢</a-select-option>
         </a-select>
       </a-form-item>
     </a-form>
-    <a-row style="font-weight: bold">信息筛选配置</a-row>
+    <a-row style="font-weight: bold; font-size: 16px;">信息筛选配置</a-row>
+    <a-divider type='horizontal' dashed />
     <a-form :form='infoSettingForm' layout='inline'>
       <div v-for="(item, index) in loopContent.data" :key='index'>
         <a-form-item v-if="!!item.relation">
@@ -85,10 +87,11 @@
           <a-icon v-if="index+1 == loopContent.data.length" theme='filled' style="color:lightgreen;" type="plus-circle" @click="addRow()" />
           <a-icon v-if="index+1 == loopContent.data.length" theme='filled' style="color:red; margin-left: 5px" type="minus-circle" @click="deleteRow(index)" />
         </a-form-item>
+        <a-divider type='horizontal' dashed />
       </div>
     </a-form>
 
-    <a-button type='link' v-if="loopContent.data.length == 0" @click="addInitRow()">新增配置</a-button>
+    <a-button type='link' v-if="loopContent.data.length == 0" @click="addInitRow()"><a-icon type="plus" />新增配置</a-button>
     <!-- <div v-if="resultList.length > 0">
       <a-divider type='horizontal' />
       <a-row style="font-weight: bold">筛选结果</a-row>