Merge branch 'dev' of ssh://git.omniview.pro:256/fangdi/housemanage/web/majorproject into dev

src/router/getMicRouters.js

@@ -45,13 +45,13 @@ async function GetRoutes(router) {
     break
       
   default: // 当前仅可使用pudong / xuhui-sit/uat进行打包
-    MicRouters = xuhui
+    MicRouters = pudong
     break
   }
 
   // 徐汇区的子项目要看当前用户是否是超管,否则不展示 处置单和投诉
-  // console.log(env)
-  if (env.indexOf('xuhui') != -1) {
+  // console.log(Store.state.userInfos)
+  if (env.indexOf('xuhui') != -1 ) {
     let newArr= []
     MicRouters.Layout.forEach((item) => {
       if (item.name != 'tousu' && item.name != 'Disposal' ) {

src/server/api.js

@@ -62,8 +62,8 @@ case 'huangpu-prod':
 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://xuhui.hm.omniview.pro/api/v2'
+  BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
   // MOCK_URL = 'https://yapi.omniview.pro/mock/278'
   break

src/views/houseData/basicInfo.vue

@@ -3,7 +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']" />
@@ -40,6 +40,11 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col span="8">
+            <a-form-item v-if="!simpleSearchForm" label="更新时间" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-range-picker v-decorator="['syncTime_betn']" />
+            </a-form-item>
+          </a-col>
           <a-col span="8">
             <a-form-item v-if="!simpleSearchForm" label="成立业主大会" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-select allowClear placeholder="请选择查询内容" v-decorator="['isHoc']" @change="changeIsHoc">
@@ -517,6 +522,11 @@ export default {
           }
         }
       }
+      let syncTime_betn = ''
+      if (this.form.getFieldValue('syncTime_betn').length >1) {
+        syncTime_betn = this.$moment(this.form.getFieldValue('syncTime_betn')[0]).format('YYYYMMDD')+'000000'
+        syncTime_betn += ','+this.$moment(this.form.getFieldValue('syncTime_betn')[1]).format('YYYYMMDD')+'235959'
+      }
       let searchParams = Object.assign({}, {
         'stNameFrst_l': this.form.getFieldValue('stNameFrst_l')|| '',
         'addrFrst_l': this.form.getFieldValue('addrFrst_l')|| '',
@@ -532,6 +542,7 @@ export default {
         'sectType': 1,
         'sectType_in': this.sectType_in,
         'c.createTime_desc': 'desc',
+        syncTime_betn, // 更新时间
         // 'finishDate_lt': !!this.isBeforeTwoThousand? '2000-01-01': '',
         'finishDate_lt': this.isBeforeTwoThousand == '1' ? '2020-01-01':'',
         'finishDate_gt': this.isBeforeTwoThousand == '2' ? '2020-01-01':'',