Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

# Conflicts:
#	api/http-request.js

app/statistics/js/comprehensive-query.js

@@ -1642,7 +1642,7 @@ new Vue({
            // console.log(res,"Sddddd")
            res.data.detailModelList.forEach(function (item) {
              item.ssc = item.ssc.replace(/^(.{4})(?:\d+)(.{1})$/, '$1****$2')
              item.idcard = item.idcard.replace(/^(.{6})(?:\d+)(.{4})$/, '$1****$2')
              // item.idcard = item.idcard.replace(/^(.{6})(?:\d+)(.{4})$/, '$1****$2')
            })
            vm.analyseData = res.data.detailModelList
            vm.datatotal = res.data.total
@@ -2380,7 +2380,7 @@ new Vue({
        searchJson = undefined
      vm.fullscreenLoading = true
      searchJson = vm.beforeReq('export')
      var areaCode = vm.areaCode == '' ? '350200' : vm.areaCode
      var areaCode = vm.areaCode == '350200' ? '' : vm.areaCode
      var chooseYear = vm.radio == '1' ? vm.chooseYear : '' //年份
      var startDate = vm.radio == '2' ? vm.searchJsonTime.start : ''
      var endDate = vm.radio == '2' ? vm.searchJsonTime.end : ''