Merge branch 'lukeyan' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb into lukeyan

src/api/safetyIndex/index.js

@@ -49,11 +49,11 @@ export function flowDetail(params) {
     })
 }
 //企业今日进园区
-export function vehicleIn(data) {
+export function vehicleIn(params) {
     return request({
         url: '/safety/tbParkVehicleRecord/list',
-        method: 'post',
+        method: 'get',
-        data
+        params
     })
 }
 // //企业今日出园区

src/utils/request.js

@@ -4,7 +4,7 @@ import vm from "../main";
 import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
-  //baseURL: 'http://172.18.113.50:8080/zhapi',
+  // baseURL: 'http://172.18.113.50:8080/zhapi',
   //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
   baseURL: `http://${window.location.host}/zhapi`,

src/views/safetyIndex/cheliang.vue

@@ -369,7 +369,7 @@ export default {
 .picForm {
     /deep/ .el-dialog {
         background-color: rgba(0, 0, 0, 0);
-        background: url('~@/assets/head/编组 3021112.png') no-repeat;
+        background: url('~@/assets/safetyIndex/弹窗009.png') no-repeat;
         background-size: 100% 100%;
         width: 1241px;
         height: 850px;