Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

12 小时以前 8a722bb7197e0370942934460a99925058ae64f6

Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

 admin/.env.development

@@ -3,9 +3,9 @@

# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'

# VUE_APP_API_URL  = 'http://192.168.1.45:10010'
VUE_APP_API_URL  = 'http://192.168.1.45:10010'

VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
# VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'

# VUE_APP_API_URL  = 'http://localhost:10010'


 admin/src/components/common/CommonHeader.vue

@@ -270,8 +270,9 @@
          newPwd: this.changePwdData.form.newPwd
        })
          .then(() => {
            console.log('修改成功')
            this.$tip.apiSuccess('修改成功')
            this.$store.commit('setUserInfo', { needChangePwd: 1 })
            // this.$store.commit('setUserInfo', { needChangePwd: 1 })
            this.visible.changePwd = false
          })
          .catch(e => {

 admin/whyc_admin/avatar/man.png

Binary files differ

 admin/whyc_admin/avatar/woman.png

Binary files differ

 admin/whyc_admin/favicon.ico

Binary files differ

 admin/whyc_admin/index.html

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/css/app.594460e9.css

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/css/chunk-vendors.04c7bff3.css

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/fonts/element-icons.535877f5.woff

Binary files differ

 admin/whyc_admin/static/fonts/element-icons.732389de.ttf

Binary files differ

 admin/whyc_admin/static/img/404-tip.4d90651f.png

Binary files differ

 admin/whyc_admin/static/img/404.5c17595f.png

Binary files differ

 admin/whyc_admin/static/img/bg@2x.db5d20c2.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe@2x.632406ea.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_chexiao@2x.966d7ff8.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_fail@2x.f31e62ff.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_pass@2x.356d8eee.png

Binary files differ

 admin/whyc_admin/static/img/default_homeimg.f3e4e5d0.png

Binary files differ

 admin/whyc_admin/static/img/default_nodata.5d1df1bb.png

Binary files differ

 admin/whyc_admin/static/img/department.0c08872e.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/dictionary.ad728d75.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/home_func1.2273dcea.png

Binary files differ

 admin/whyc_admin/static/img/home_func5.d27eba52.png

Binary files differ

 admin/whyc_admin/static/img/listener.fcf79708.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log-login.5b08fa8b.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log-opera.f8d4f877.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log.f8f7b2f8.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/login_img@2x.cb2860d8.png

Binary files differ

 admin/whyc_admin/static/img/man.6eaa0e37.png

Binary files differ

 admin/whyc_admin/static/img/permission.14c1bcf1.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/position.8a867f13.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/pwd.f269b92a.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/role.2a1931ed.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/shield.7b210670.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/top_ic_bolang@2x.b1c83ed4.png

Binary files differ

 admin/whyc_admin/static/js/app.41eac9ab.js

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/app.41eac9ab.js.map

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/chunk-vendors.0ab6eb75.js

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/chunk-vendors.0ab6eb75.js.map

ÎļþÒÑɾ³ý

 admin/whyc_admin/template/cars.xlsx

Binary files differ

 admin/whyc_admin/template/jkCustomerTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/jkLineTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/jkOrdersTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/member.xlsx

Binary files differ

 admin/whyc_admin/template/oil.xlsx

Binary files differ

 admin/whyc_admin/template/traintime.xlsx

Binary files differ

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java

@@ -1471,7 +1471,8 @@
                    .filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
            //优化后数据
            List<JkSketchLine> afterList = childLineList.stream()
                    .filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
                    .filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)
                            && Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());

            lineNum = lineNum + (Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)?beforeList.size():afterList.size());
            List<TelecomLineDataVO> telecomLineDataVOList = new ArrayList<>();
@@ -1521,6 +1522,26 @@
        List<JkSketchLine> jkSketchLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);

        List<TelecomCategoryDataVO> telecomCategoryDataVOList = new ArrayList<>();
        for (JkSketch jkSketch:sketchList) {
            TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
            telecomCategoryDataVO.setId(jkSketch.getCategoryId());
            telecomCategoryDataVO.setName(jkSketch.getCategoryName());
            //优化前数据
            List<JkSketchLine> beforeList = jkSketchLineList.stream()
                    .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())
                            && Objects.nonNull(i.getDistance())
                            &&Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
            telecomCategoryDataVO.setDistance(
                    beforeList.stream().map(i->i.getDistance()).reduce(Long.valueOf(0),Long::sum)
            );
            if(Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)){
                telecomCategoryDataVO.setDistanceAfter(telecomCategoryDataVO.getDistance());
            }else{
                //优化后数据
                List<JkSketchLine> afterList = jkSketchLineList.stream()
                        .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())
                                && Objects.nonNull(i.getDistance())
                                &&Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
        if(sketchList!=null){
            for (JkSketch jkSketch:sketchList) {
                TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();