最新版本541200007

jiangping

2024-12-12 b43c133c1e9ba56560d96425d9ca4375b2e44063

最新版本541200007

 admin/.env.development

@@ -1,8 +1,8 @@
# å¼€å‘环境配置
NODE_ENV = 'development'

VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
#  VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
# VUE_APP_API_URL  = 'http://192.168.0.101:10010'
# VUE_APP_API_URL  = 'http://192.168.0.173/gateway_interface'
#  VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'


 admin/src/views/index.vue

@@ -1,5 +1,6 @@
<template>
  <div class="main_home">
    <div style="position: fixed;z-index: 99999"><video  style="height: 100px;width: 500px" src="rtsp://10.50.250.253:554/openUrl/K2y2vE4" controls></video></div>
    <div class="home_header">
      <div class="mb10 fs17">下午好，{{ userInfo.realname }}</div>
      <div class="fs13">

 screen/package-lock.json

ÎļþÌ«´ó

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java

@@ -15,12 +15,17 @@
         "code": 0,
         "data": [
             {
                 "ncCreateDate": "2024-09-10 08:20:04",
                 "toRepertotyName": "芜湖市烟草公司仓库",
                 "contractNumber": "112895169",
                 "orderStatus": "到达卸货地",
                 "fromRepertotyName": "芜湖成品库",
                 "plateNumber": "皖B25010"
     "contractNumber": "112718591",
     "ncCreateDate": "2024-06-20 09:08:01",
     "deliveryEnterprise": "蚌埠成品库",
     "receiveEnterprise": "宿州市卷烟配送中心",
     "transportCode": "39828",
     "transportDate": "2024-06-20 09:04:46.0",
     "driverName": "王付兰",
     "driverTel": "19955211695",
     "plateName": "皖CC2585",
     "orderStatus": "5",
     "orderStatusDesc": "到达卸货地-电子锁汽运"
             }
         ],
         "message": "操作成功"
@@ -28,10 +33,16 @@
     */
 
    private String   contractNumber    ; //合同号
    private String   fromRepertotyName    ; //发货地
    private String    toRepertoty    ; //到货地
    private String   deliveryEnterprise    ; //发货地
    private String    receiveEnterprise    ; //到货地
    private String    plateNumber; //    è½¦ç‰Œå·    åˆåŒæœªé…è½½åˆ™æ— 
    private String   orderStatus    ; //当前运输单状态
    private String   ncCreateDate; //    åˆ¶å•æ—¶é—´
    private String      transportDate; //
    private String      transportCode; //
    private String     driverName; //
    private String           driverTel; //
    private String            orderStatusDesc; //


}

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

@@ -376,7 +376,8 @@
                    && response.getData().getAppointmentInfoList() !=null
                    && response.getData().getAppointmentInfoList().size()>0)){
                id =response.getData().getAppointmentInfoList().get(0).getOrderId();
                qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
                qrcode =response.getData().getAppointmentInfoList().get(0).getVerificationCode();
//                qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
            }
            reson = response!=null?JSONObject.toJSONString(response):"";
        }else{
@@ -437,7 +438,8 @@
                    && response.getData().getAppointmentInfoList() !=null
                    && response.getData().getAppointmentInfoList().size()>0)){
                id =response.getData().getOrderId();
                qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
//                qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
                qrcode =response.getData().getAppointmentInfoList().get(0).getVerificationCode();
            }
            reson = response!=null?JSONObject.toJSONString(response):"";
        }else{

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

@@ -400,12 +400,13 @@
        request.setSorts(new ArrayList<>());
        RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
        file.setFieldName("event_type");
        file.setFieldValue("131588");//安防告警
        file.setFieldValue("131588,131593");//安防告警和人员告警
        file.setType("in");
        if(type == 1){
            file.setFieldValue("131588");//安防告警
        }else  if(type == 2){

        }else  if(type == 1){

            file.setFieldValue("131593");//人员告警
        }
        request.getFiledOptions().add(file);
        SortRequest sort = new SortRequest();