Merge branch 'xuhui' into dev

package.json

@@ -15,10 +15,7 @@
     "build:xuhui-sit": "cross-env NODE_ENV='xuhui-sit' node build/build.js",
     "build:xuhui-prod": "cross-env NODE_ENV='xuhui-prod' node build/build.js",
     "build:huangpu-sit": "cross-env NODE_ENV='huangpu-sit' node build/build.js",
-    "build:huangpu-prod": "cross-env NODE_ENV='huangpu-prod' node build/build.js",
-    "build:yangpu-sit": "cross-env NODE_ENV='yangpu-sit' node build/build.js",
-    "build:yangpu-prod": "cross-env NODE_ENV='yangpu-prod' node build/build.js"
-
+    "build:huangpu-prod": "cross-env NODE_ENV='huangpu-prod' node build/build.js"
   },
   "dependencies": {
     "ant-design-vue": "^1.4.3",

src/store/mutations.js

@@ -8,9 +8,6 @@ export default {
   setRoutes(state, data) {
     state.routes = data
   },
-  CHANGE_ISXUHUI(state, data) {
-    state.isXuhui = data
-  },
   setWebviewSrc(state, src) {
     state.webviewSrc = src
   },

src/store/state.js

@@ -17,6 +17,5 @@ export default {
   tabName: '',
   webviewSrc: null,
   content: null,
-  openKeys: [],
-  isXuhui: false, // 是否为徐汇项目
+  openKeys: []
 }

src/views/home.vue

 <template>
-  <div id="home" class="layoutPadding">
+  <div id="home" class="layoutPadding" v-if="(this.$api.BASE_URL).indexOf('xuhui') > -1 || (this.$api.BASE_URL).indexOf('31.0.161.39') > -1">
       <a-row type="flex"  class="align-stretch">
         <a-col :span="16">
           <a-row type="flex" style="padding-right:10px;height:100%;">
@@ -58,7 +58,7 @@
           </a-row>
         </a-col>
         <a-col :span="4">
-          <div class="home-card topBox" style="margin-left:0px 10px;" @click="handleExpired">
+          <div class="home-card topBox" style="margin-left:0px 10px; cursor: pointer" @click="handleExpired">
                 <div class="justify-between topBox" >
                   <div>
                     <p class="top-font" >已过期</p>
@@ -71,7 +71,7 @@
               </div>
         </a-col>
         <a-col :span="4">
-          <div class="home-card topBox" style="margin-left:10px;" @click="handleWillExpire">
+          <div class="home-card topBox" style="margin-left:10px; cursor: pointer" @click="handleWillExpire">
                 <div class="justify-between topBox" >
                   <div>
                     <p class="top-font" >未来5个月将到期</p>
@@ -539,6 +539,63 @@
         </a-col>
       </a-row>
   </div>
+
+  <div id="home" class="layoutPadding" v-else>
+    <div class="topBox">
+      <div class="inner" style="">
+          <div>
+            <p class="top-font" >小区数</p>
+            <span class="top-count" >{{data.community}}</span>
+          </div>
+          <div class="align-center" >
+            <img src="@/assets/icon/xqs.png" style="width:50px;" alt="">
+          </div>
+      </div>
+      <div class="inner" style="">
+          <div>
+            <p class="top-font" >门牌幢数</p>
+            <span class="top-count" >{{data.building}}</span>
+          </div>
+          <div class="align-center" >
+            <img src="@/assets/icon/mpzs.png" style="width:50px;" alt="">
+          </div>
+      </div>
+      <div class="inner" style="">
+          <div>
+            <p class="top-font" >物业企业数</p>
+            <span class="top-count" >{{data.company}}</span>
+          </div>
+          <div class="align-center" >
+            <img src="@/assets/icon/ywhs.png" style="width:50px;" alt="">
+          </div>
+        </div>
+      <div class="inner" style="">
+          <div>
+            <p class="top-font" >业委会数</p>
+            <span class="top-count" >{{data.ic}}</span>
+          </div>
+          <div class="align-center" >
+            <img src="@/assets/icon/ywhs.png" style="width:50px;" alt="">
+          </div>
+      </div>
+    </div>
+    <div class="secBox">
+      <IndustrySupervision  style="width:35%" />
+      <ComplaintsTrain moduletitle="投诉直通车" style="width:48%" />
+      <FileModule style="width:13%;" />
+    </div>
+    <div class="thirdBox">
+      <ManagementModule moduletitle="信用" style="width:32.5%" />
+      <ManagementModule moduletitle="风险" style="width:32.5%"  />
+      <ManagementModule moduletitle="分类" style="width:32.5%"  />
+    </div>
+    <div class="fourthBox">
+      <RiskDisposal style="width:30%" />
+      <RetrofitElevator style="width:32%"  />
+      <ComplaintsTrain moduletitle="应急报修" style="width:36%" />
+    </div>
+
+  </div>
 </template>
 
 <script>

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" align='top' :gutter="18">
           <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']" />
@@ -43,7 +41,7 @@
             </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-form-item label="成立业主大会" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-select allowClear placeholder="请选择查询内容" v-decorator="['isHoc']" @change="changeIsHoc">
                 <a-select-option value="false">否</a-select-option>
                 <a-select-option value="true">是</a-select-option>
@@ -51,7 +49,7 @@
             </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-form-item label="小区性质" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-select
                 v-decorator="['stKind_in']"
                 mode="multiple"
@@ -64,9 +62,25 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <!-- 动态搜索条件 -->
+          <template v-if="customKeyEnable">
+            <a-col span="8"  v-for="i in searchList" :key="i.id" >
+              <a-form-item :label="i.keyName" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+                <a-select @change="handleChangeZdy(i.keyCode,$event)" v-if="i.compntType == 'select' || i.compntType == 'radio'" showSearch allowClear placeholder="请选择查询内容" v-decorator="[i.keyCode]">
+                  <a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
+                </a-select>
+                <a-select @change="handleChangeZdy(i.keyCode,$event)" mode="multiple" v-else-if="i.compntType =='checkbox'"  placeholder="请选择查询内容(多选)" v-decorator="[i.keyCode]">
+                  <a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
+                </a-select>
+                <a-date-picker @change="handleChangeZdy(i.keyCode,$event)" v-else-if="i.compntType =='date'"  v-decorator="[i.keyCode]"  />
+                <a-input v-else-if="i.compntType =='num'" type="tel" placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
+                <a-input v-else placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
+              </a-form-item>
+            </a-col>
+          </template>
 
           <a-col span="8">
-            <a-form-item v-if="!simpleSearchForm" label="小区层数" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+            <a-form-item label="小区层数" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-select
                 v-decorator="['stLevel']"
                 mode="multiple"
@@ -81,63 +95,34 @@
           </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="['wuyeServiceType'] " @change="changeServiceType">
+            <a-form-item label="物业服务类型" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['wuyeServiceType'] " @change="changeServiceType">
                 <a-select-option v-for="(item) in wuyeServiceType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
               </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-select allowClear placeholder="请选择查询内容" v-decorator="['finishDate'] " @change="changeFinishDate">
-                <a-select-option v-for="(item) in finishDate" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
+            <a-form-item label="邻里小汇类型" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-select showSearch 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>
             </a-form-item>
           </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-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-col span="8">
+            <a-form-item label="竣工日期" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['finishDate'] " @change="changeFinishDate">
+                <a-select-option v-for="(item) in finishDate" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
-          <!-- 动态搜索条件 -->
-          <template v-if="customKeyEnable">
-            <a-col span="8"  v-for="i in searchList" :key="i.id" >
-              <a-form-item :label="i.keyName" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
-                <a-select @change="handleChangeZdy(i.keyCode,$event)" v-if="i.compntType == 'select' || i.compntType == 'radio'" showSearch allowClear placeholder="请选择查询内容" v-decorator="[i.keyCode]">
-                  <a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
-                </a-select>
-                <a-select @change="handleChangeZdy(i.keyCode,$event)" mode="multiple" v-else-if="i.compntType =='checkbox'"  placeholder="请选择查询内容(多选)" v-decorator="[i.keyCode]">
-                  <a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
-                </a-select>
-                <a-date-picker @change="handleChangeZdy(i.keyCode,$event)" v-else-if="i.compntType =='date'"  v-decorator="[i.keyCode]"  />
-                <a-input v-else-if="i.compntType =='num'" type="tel" placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
-                <a-input v-else placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
-              </a-form-item>
-            </a-col>
-          </template>
-
           <!-- 功能按钮区 -->
           <a-col span="24" class="algin-right">
             <a-button  @click="exportEWM">导出二维码</a-button>
             <a-button  @click="exportList">导出数据</a-button>
             <a-button @click="reset">重置</a-button>
             <a-button type="primary" @click="search">搜索</a-button>
-             <a-button
-              type="primary"
-              v-if="simpleSearchForm"
-              @click="showMoreSearch"
-              >更多搜索</a-button
-            >
-            <a-button
-              type="primary"
-              v-if="!simpleSearchForm"
-              @click="closeMoreSearch"
-              >简单搜索</a-button
-            >
           </a-col>
         </a-row>
       </a-form>
@@ -155,8 +140,6 @@ export default {
   name: 'basicInfo',
   data() {
     return {
-      simpleSearchForm: true, // 展示、收取简单搜索开关，true为简单搜索
-
       levelType: [
         {
           name: '单层',
@@ -354,26 +337,6 @@ export default {
   beforeCreate() { // 页面进来创建form
     this.form = this.$form.createForm(this)
   },
-  computed: {
-    formItemLabelCol() {
-      let labelCol = {}
-      if (this.simpleSearchForm) {
-        labelCol = { span: 0 }
-      } else {
-        labelCol = { span: 8 }
-      }
-      return labelCol
-    },
-    formItemWrapperCol() {
-      let wrapperCol = {}
-      if (this.simpleSearchForm) {
-        wrapperCol = { span: 24 }
-      } else {
-        wrapperCol = { span: 16 }
-      }
-      return wrapperCol
-    }
-  },
   created () { // 进页面获取数据
     this.customKeyEnable=this.$cookie.get('customKeyEnable')
     this.getHos()
@@ -795,7 +758,7 @@ export default {
 
       case '2':
         this.tableName = 'tbl_community'
-        this.formed = '10, ' + (this.$moment().format('L').split('/')).join('')
+        this.formed = '10,' + (this.$moment().format('L').split('/')).join('')
         this.type = 'bet'
         break  
 

src/views/houseData/cmDivision.vue

@@ -8,13 +8,6 @@
             <a-input placeholder="请输入查询内容" v-decorator="['csName_l']" />
           </a-form-item>
         </a-col>
-        <a-col span="8">
-           <a-form-item label="街道名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
-              <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.streetId']"  @change="changeStreet">
-                <a-select-option v-for="(item) in street" :key="item.streetId" :value="item.strName+'#'+item.streetId">{{ item.strName }}</a-select-option>
-              </a-select>
-            </a-form-item>
-        </a-col>
         <!-- 动态搜索条件 -->
         <template v-if="customKeyEnable">
           <a-col span="8"  v-for="i in searchList" :key="i.id" >
@@ -98,14 +91,12 @@ export default {
         pageSizeOptions: ['10', '20', '50', '100'],
       },
       tableData: [],
-      street: []
     }
   },
   beforeCreate() { // 页面进来创建form
     this.form = this.$form.createForm(this)
   },
   created () { // 进页面获取数据
-    this.getStreet()
     this.customKeyEnable=this.$cookie.get('customKeyEnable')
     if(this.customKeyEnable && this.customKeyEnable == 'true'){
       // this.getKeys()
@@ -122,22 +113,6 @@ export default {
     }
   },
   methods: {
-    getStreet(){ //获取街道下拉
-      this.$ajax.get({
-        url: this.$api.GET_STREET_LIST,
-        params: {
-          pageSize: 10000
-        }
-      }).then(res => {
-        this.street = this.$com.confirm(res, 'data.content', [])
-      })
-    },
-    changeStreet(value) { // 切换街道
-      this.form.setFieldsValue({
-        'c.streetId': value
-      })
-      this.search()
-    },
     handleChangeZdy(i, e){ // 自定义字段 - 搜索条件的 change
       if (Object.prototype.toString.call(e)== '[object Array]') {
         e2 = e.join(',')
@@ -171,7 +146,6 @@ export default {
       const searchParams = Object.assign({}, {
         'csName_l': !this.form.getFieldValue('csName_l')?'':this.form.getFieldValue('csName_l'),
         'sectType_in': '1',
-        'c.streetId': !this.form.getFieldValue('c.streetId')?'':this.form.getFieldValue('c.streetId').split('#')[1],
       }, obj)
 
       this.searchParams = searchParams

src/views/houseData/indCous.vue

@@ -44,7 +44,7 @@
           </a-col>
 
           <a-col span="6" >
-            <a-form-item label="是否为党员" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+            <a-form-item label="职务党员情况" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-select allowClear placeholder="请选择查询内容" v-decorator="['isDY']" >
                 <a-select-option v-for="(item) in dyList" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
               </a-select>