Merge branch 'xuhui' into dev

Dockerfile

 FROM 10.0.6.228:5000/node-nginx:8.12.0-slim
 WORKDIR /app
 COPY . /app/
-RUN  npm config set proxy=http://10.0.6.228:3128 && npm set registry https://registry.npm.taobao.org && npm install && npm run build:huangpu-sit && cp -r dist/* /var/www/html && cp nginx.conf /etc/nginx/conf.d && rm -rf /etc/nginx/sites-enabled &&  rm -rf /app
+RUN  npm config set proxy=http://10.0.6.228:3128 && npm set registry https://registry.npm.taobao.org && npm install && npm run build:xuhui-sit && cp -r dist/* /var/www/html && cp nginx.conf /etc/nginx/conf.d && rm -rf /etc/nginx/sites-enabled &&  rm -rf /app
 

Jenkinsfile

@@ -8,9 +8,9 @@ pipeline {
     environment {
         KUBECONFIG_CREDENTIAL_ID = 'devops-kubeconfig'
         REGISTRY = '10.0.6.228:5000'
-        DOCKERHUB_NAMESPACE = 'house-manage-hp'
+        DOCKERHUB_NAMESPACE = 'house-manage-xh'
         APP_NAME = 'web-main'
-        NAMESPACE = 'house-manage-hp'
+        NAMESPACE = 'house-manage-xh'
     }
 
     stages {

src/main.js

@@ -50,13 +50,13 @@ import {
   Anchor,
   // Collapse,
   Popconfirm,
-  // Progress,
+  Progress,
   // Switch,
   Calendar,
   // BackTop,
   // Carousel,
   Tooltip,
-  Progress,
+  // Progress,
   // CollapsePanel
 } from 'ant-design-vue' 
 
@@ -130,7 +130,7 @@ Vue.use(LocaleProvider)
 Vue.use(Anchor)
 // Vue.use(Collapse)
 Vue.use(Popconfirm)
-// Vue.use(Progress)
+Vue.use(Progress)
 // Vue.use(Switch)
 Vue.use(Calendar)
 // Vue.use(BackTop)
@@ -193,7 +193,7 @@ const render = ({appContent, loading} = {}) => { // 渲染方法
 let system //= micSystemsList
 let env = process.env.NODE_ENV
 
-console.log(process.env.NODE_ENV, 'NODE_ENV')
+// console.log(process.env.NODE_ENV, 'NODE_ENV')
 switch (env) {
 // case env.indexOf('pudong') > -1: // 根据当前打包的项目调用该项目对应的路由
 case 'pudong-sit':

src/server/api.js

@@ -52,7 +52,8 @@ case 'huangpu-prod':
 
 default: // 默认环境下（开发环境）
   // BASE_URL = 'http://31.0.161.39/apiv2' 
-  BASE_URL = 'http://211.136.105.193/apiv2'
+  // BASE_URL = 'http://211.136.105.193/apiv2'
+  BASE_URL = 'http://xuhui.hm.omniview.pro/api'
   // BASE_URL = 'http://pudong.hm.omniview.pro/api'
  
   // MOCK_URL = 'https://yapi.omniview.pro/mock/278'

src/views/houseData/basicInfo.vue

@@ -78,6 +78,45 @@
               </a-form-item>
             </a-col>
           </template>
+
+          <a-col span="8">
+            <a-form-item label="小区层数" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-select
+                v-decorator="['stLevel']"
+                mode="multiple"
+                style="width: 100%"
+                placeholder="请选择小区层数（多选）"
+                @change="changeLevel"
+                allowClear
+              >
+                <a-select-option v-for="i in levelType" :key="i.key">{{i.name}}</a-select-option>
+              </a-select>
+            </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="['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 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">
+            <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>
           <!-- 功能按钮区 -->
           <a-col span="24" class="algin-right">
             <a-button  @click="exportEWM">导出二维码</a-button>
@@ -101,6 +140,66 @@ export default {
   name: 'basicInfo',
   data() {
     return {
+      levelType: [
+        {
+          name: '单层',
+          key: '1'
+        },
+        {
+          name: '多层',
+          key: '2'
+        },
+      ],
+      finishDate: [
+        {
+          name: '2000年以前',
+          key: '1'
+        },
+        {
+          name: '2000年以后',
+          key: '2'
+        },
+      ],
+      neighbourType: [
+        {
+          name: '未成立',
+          key: '1'
+        },
+        {
+          name: '已成立',
+          key: '2'
+        },
+        {
+          name: '前期筹备中',
+          key: '3'
+        },
+      ],
+      wuyeServiceType: [
+        {
+          name: '专业委托物业管理（前期阶段）',
+          key: '1'
+        },
+        {
+          name: '专业委托物业管理（业主大会阶段）',
+          key: '2'
+        },
+        {
+          name: '无人管理',
+          key: '3'
+        },
+        {
+          name: '自治管理',
+          key: '4'
+        },
+        {
+          name: '直管物业（公房）',
+          key: '5'
+        },
+        {
+          name: '单位自管（公房）',
+          key: '6'
+        },
+      ],
       customKeyEnable: false, // cookie里存的是否开启自定义字段
       typeList: [ //小区性质的数据
         {
@@ -226,6 +325,12 @@ export default {
         totHous: '', // 总分户数   户
       },
       tableData: [],
+      stLevel: '',
+      cspServiceType: '',
+      tableName: '', // 邻里小汇
+      formed: '', // 邻里小汇
+      type: '', // 邻里小汇
+      isBeforeTwoThousand: false
     }
   },
   beforeCreate() { // 页面进来创建form
@@ -349,8 +454,15 @@ 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,
+        'cspServiceType': !this.cspServiceType? '': this.cspServiceType,
+        'tableName': !this.tableName?'': this.tableName,
+        'formed': !this.formed?'': this.formed,
+        'type': !this.type? '': this.type,
         'sectType_in': '1',
-        'c.createTime_desc': 'desc'
+        'c.createTime_desc': 'desc',
+        'finishDate_lt': !!this.isBeforeTwoThousand? '20000101': '',
+        'finishDate_gt': !this.isBeforeTwoThousand? '20000101': '',
       }, obj, isHocId)// 融合obj 和isHocId 到入参
       if (this.$route.query.id && this.$route.query.id != '') {
         // 如果query的id不为空,则回显,并根据id搜索
@@ -603,6 +715,62 @@ export default {
         window.open (this.$api.GET_EXPORT_EWM+'?streetId='+streetsId+'&stNameFrst_l='+stNameFrst_l+'&token='+token)
       }
     },
+    changeLevel(val) {
+      console.log(val)
+      if(val.length == 2) {
+        this.stLevel = '8'
+      } else {
+        this.stLevel = val[0]
+      }
+
+      this.getList()
+    },
+    changeServiceType(val) {
+      this.cspServiceType = val
+      this.getList()
+    },
+    changeNeighbourType(val) {
+      switch (val) {
+      case '1':
+        this.tableName = 'tbl_community'
+        this.formed = ''
+        this.type = 'un'
+        break
+
+      case '2':
+        this.tableName = 'tbl_community'
+        this.formed = '10, ' + (this.$moment().format('L').split('/')).join('')
+        this.type = 'bet'
+        break  
+
+      case '3':
+        this.tableName = 'tbl_community'
+        this.formed = '前期筹备中'
+        this.type = 'l'
+        break  
+      
+      default:
+        break
+      }
+
+      this.getList()
+    },
+    changeFinishDate(val) {
+      switch (val) {
+      case '1':
+        this.isBeforeTwoThousand = true
+        break
+
+      case '2':
+        this.isBeforeTwoThousand = false
+        break
+      
+      default:
+        this.isBeforeTwoThousand = false
+        break
+      }
+      this.getList()
+    }
   },
 
 }