小区详情自定义字段拼接完成,邻小慧修改,部分参数修改

src/components/detail/detailItem.vue

@@ -52,16 +52,22 @@ export default {
 }
 </script>
 <style>
-.detailContent { margin: -1px; font-size: 14px; line-height: 40px;border: 1px solid #ccc}
-.detailContent  .label { white-space: nowrap;
-
-overflow: hidden;
-
-text-overflow: ellipsis;border-right:1px solid #ccc;  background-color: #fafafa; text-align: right; color:rgba(0, 0, 0, 0.65)}
-.detailContent  .text {white-space: nowrap;
-
-overflow: hidden;
-
-text-overflow: ellipsis;padding-left: 8px; text-align: left; word-break:break-all;}
+.detailContent { margin: -.5px; font-size: 14px; line-height: 40px;border: 1px solid #ccc}
+.detailContent  .label { 
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-right:1px solid #ccc;
+  background-color: #fafafa;
+  text-align: right; color:rgba(0, 0, 0, 0.65);
+}
+.detailContent  .text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding-left: 8px; 
+  text-align: left;
+  word-break:break-all;
+}
 
 </style>

src/router/getMicRouters.js

@@ -48,6 +48,8 @@ async function GetRoutes(router) {
     break
   }
 
+  console.log(MicRouters)
+
   const micSystemRoutersConfigs = Object.assign({}, MicRouters)
   const { routes } = router.options
   const parent = routes.find(item => item.name === 'Layout')

src/views/home.vue

@@ -709,21 +709,25 @@ export default {
   created(){},
   mounted(){
     console.log('当前登录api: ' + this.$api.BASE_URL)
-    this.getList()
-    this.getConfig()
-    this.getDisposal()
-    this.getHouthMonth()
-    this.getCheckData()
-    this.getCheckPeople()
-    this.getSectNum()
-    this.getReceiptsNum()
-    this.getRepair()
-    this.getTousuQuestion('M')
-    this.getTousuQuestion('Y')
-    this.getTousuQuestion('S')
-    this.getTousuDensity('M')
-    this.getTousuDensity('Y')
-    this.getTousuDensity('S')
+    if (this.$api.BASE_URL.indexOf('xuhui')!=-1 || this.$api.BASE_URL.indexOf('31.0.161.39')!=-1 ) { //徐汇分支
+      console.log('徐汇')
+      this.getList()
+      this.getConfig()
+      this.getDisposal()
+      this.getHouthMonth()
+      this.getCheckData()
+      this.getCheckPeople()
+      this.getSectNum()
+      this.getReceiptsNum()
+      this.getRepair()
+      this.getTousuQuestion('M')
+      this.getTousuQuestion('Y')
+      this.getTousuQuestion('S')
+      this.getTousuDensity('M')
+      this.getTousuDensity('Y')
+      this.getTousuDensity('S')
+    } 
+ 
   },
   methods: {
     /**

src/views/houseData/basicInfo.vue

@@ -3,9 +3,7 @@
   <div class="routerWapper">
     <div v-if="$route.path == '/houseData/basicInfo'" 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-row class="formItem" type="flex"  :justify="simpleSearchForm ? 'end' : ''" align="top" :gutter="simpleSearchForm ? 16 : 0">
           <a-col span="8">
             <a-form-item label="小区名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-input placeholder="请输入查询内容" v-decorator="['stNameFrst_l']" />
@@ -68,7 +66,7 @@
           <a-col span="8">
             <a-form-item v-if="!simpleSearchForm" label="小区层数" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-select
-                v-decorator="['stLevel']"
+                v-decorator="['unitKind_in']"
                 mode="multiple"
                 style="width: 100%"
                 placeholder="请选择小区层数（多选）"
@@ -97,7 +95,7 @@
           </a-col>
 
           <a-col span="8" v-if="$store.state.isXuhui">
-            <a-form-item v-if="!simpleSearchForm" label="邻里小汇类型" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+            <a-form-item v-if="!simpleSearchForm" label="邻小汇成立状态" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-select  allowClear placeholder="请选择查询内容" v-decorator="['neighbourType'] " @change="changeNeighbourType">
                 <a-select-option v-for="(item) in neighbourType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
               </a-select>
@@ -166,6 +164,10 @@ export default {
           name: '多层',
           key: '2'
         },
+        {
+          name: '别墅',
+          key: '3'
+        },
       ],
       finishDate: [
         {
@@ -516,7 +518,7 @@ export default {
         'c.streetId': !this.form.getFieldValue('c.streetId')?'':this.form.getFieldValue('c.streetId').split('#')[1],
         'stKind_in': !this.form.getFieldValue('stKind_in')?'':this.form.getFieldValue('stKind_in').join(','),
         'unitAddr': !this.form.getFieldValue('unitAddr')?'':this.form.getFieldValue('unitAddr'),
-        'unitKind': !this.stLevel?'': this.stLevel,
+        'unitKind_in': !this.stLevel?'': this.stLevel,
         'cspServiceType': !this.cspServiceType? '': this.cspServiceType,
         // 'tableName': !this.tableName?'': this.tableName,
         'type': !this.type? '': this.type,
@@ -782,13 +784,15 @@ export default {
     },
     changeLevel(val) {
       console.log(val)
-      if(val.length == 2) {
-        this.stLevel = '8'
-      } else {
-        this.stLevel = val[0]
-      }
+      this.stLevel = val.join(',')
 
-      this.getList()
+      // if(val.indexOf('1')!=-1 && val.indexOf('2')!=-1) {
+      //   this.stLevel = '8'
+      // } else {
+      //   this.stLevel = val[0]
+      // }
+
+      // this.getList()
     },
     changeServiceType(val) {
       this.cspServiceType = val
@@ -820,7 +824,7 @@ export default {
         break
       }
 
-      this.getList()
+      // this.getList()
     },
     changeFinishDate(val) {
       switch (val) {
@@ -836,7 +840,7 @@ export default {
         this.isBeforeTwoThousand = 'none'
         break
       }
-      this.getList()
+      // this.getList()
     }
   },