diff --git a/.env.development b/.env.development index 7c12b47..3b065fe 100644 --- a/.env.development +++ b/.env.development @@ -13,7 +13,7 @@ NODE_ENV = 'development' # 沈阳合盈线上 # VITE_API_URL = "http://101.43.164.214:45022" # 演示平台 -VITE_API_URL = 'http://jxj.zhgdyun.com:9809' +# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 # VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) @@ -21,7 +21,7 @@ VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -# VITE_API_URL = 'http://47.93.215.234:9809' +VITE_API_URL = 'http://47.93.215.234:9809' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/assets/images/vehicleManagement/car.png b/src/assets/images/vehicleManagement/car.png index 3182f3b..ca43a99 100644 Binary files a/src/assets/images/vehicleManagement/car.png and b/src/assets/images/vehicleManagement/car.png differ diff --git a/src/assets/images/vehicleManagement/car2.png b/src/assets/images/vehicleManagement/car2.png new file mode 100644 index 0000000..3182f3b Binary files /dev/null and b/src/assets/images/vehicleManagement/car2.png differ diff --git a/src/config/config.ts b/src/config/config.ts index 506a59f..d03b9fe 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -23,9 +23,9 @@ export const BAIDU_MAP_KEY: string = ""; export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 -export const COMPANY: string = ""; //标准版 +// export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "as"; //鞍山项目 -// export const COMPANY: string = "agjt"; //鞍钢集团 +export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页) diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index bf12929..72c4c17 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -103,6 +103,7 @@ import { COMPANY } from "@/config/config"; import { useRouter } from "vue-router"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL; let nowTime = ref("2023-04-16 09:22:12" as any); let nowDate = ref("2023.11.16" as any); @@ -560,8 +561,7 @@ function jumpBgd() { }else if(COMPANY === "as"){ window.location.replace("http://182.90.224.237:15551/#/login?token=" + store.token); }else if(COMPANY === "agjt"){ - console.log('123123') - window.location.replace("http://angang.xingzong.tech:9809/#/login?token=" + store.token); + window.location.replace(BASEURL + "/#/login?token=" + store.token); } else { // 新项目通用(百色服务器) window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token); diff --git a/src/views/sevenLargeScreen/laborManagement/rightTop.vue b/src/views/sevenLargeScreen/laborManagement/rightTop.vue index 83320b3..94e4e2b 100644 --- a/src/views/sevenLargeScreen/laborManagement/rightTop.vue +++ b/src/views/sevenLargeScreen/laborManagement/rightTop.vue @@ -102,7 +102,7 @@ function initOption() { // x: "right", top: "25%", // right: 400, - right: "30%", + right: "0%", // bottom: 30, align: "left", textStyle: { diff --git a/src/views/sevenLargeScreen/vehicleManagement/bottom-right.vue b/src/views/sevenLargeScreen/vehicleManagement/bottom-right.vue index 9fe42d1..296de3a 100644 --- a/src/views/sevenLargeScreen/vehicleManagement/bottom-right.vue +++ b/src/views/sevenLargeScreen/vehicleManagement/bottom-right.vue @@ -20,30 +20,34 @@ @@ -60,6 +64,7 @@ import { reactive, ref, onMounted } from "vue"; import { getEntryAndExitListApi } from "@/api/modules/vehicle"; import { GlobalStore } from "@/stores"; +import noDataImage from "@/assets/images/vehicleManagement/car.png" const store = GlobalStore(); const BASEURL = import.meta.env.VITE_API_URL; const pageNo = ref(1 as any); @@ -214,17 +219,24 @@ onMounted(async () => { display: flex; justify-content: space-around; color: #fff; - line-height: 25px; + // line-height: 25px; font-size: calc(100vw * 12 / 1920); .list-img { .el-img { width: 50px; height: 25px; } + img{ + width: 62px; + height: 62px; + } } div { text-align: center; width: 11%; + display: flex; + align-items: center; + justify-content: center } } .listStyle:hover { diff --git a/src/views/sevenLargeScreen/vehicleManagement/topLeft.vue b/src/views/sevenLargeScreen/vehicleManagement/topLeft.vue index 93262e7..243427c 100644 --- a/src/views/sevenLargeScreen/vehicleManagement/topLeft.vue +++ b/src/views/sevenLargeScreen/vehicleManagement/topLeft.vue @@ -6,7 +6,7 @@
- +
@@ -20,7 +20,7 @@
- +
识别车牌号
@@ -113,11 +113,18 @@ onMounted(async () => { height: 90%; background: url("@/assets/images/vehicleManagement/leftImg.png") no-repeat; background-size: 100% 100%; + display: flex; + align-items: center; + justify-content: center; img { width: 91%; height: 92%; margin: 2% 4%; } + .noDataImg{ + width: 12%; + height: 20%; + } } } .rightMenu { @@ -132,11 +139,18 @@ onMounted(async () => { width: 100%; background: url("@/assets/images/vehicleManagement/carNumImg.png") no-repeat; background-size: 100% 100%; + display: flex; + align-items: center; + justify-content: center; img { width: 91%; height: 86%; margin: 2% 4%; } + .noDataImg{ + width: 25%; + height: 78%; + } } .carNumTwo { margin-top: 7%; diff --git a/src/views/sevenLargeScreen/vehicleManagement/topRight.vue b/src/views/sevenLargeScreen/vehicleManagement/topRight.vue index abfc09b..7db2300 100644 --- a/src/views/sevenLargeScreen/vehicleManagement/topRight.vue +++ b/src/views/sevenLargeScreen/vehicleManagement/topRight.vue @@ -6,7 +6,8 @@
- + +
@@ -20,7 +21,8 @@
- + +
识别车牌号
@@ -112,11 +114,18 @@ onMounted(async () => { height: 90%; background: url("@/assets/images/vehicleManagement/leftImg.png") no-repeat; background-size: 100% 100%; + display: flex; + align-items: center; + justify-content: center; img { width: 91%; height: 92%; margin: 2% 4%; } + .noDataImg{ + width: 12%; + height: 20%; + } } } .rightMenu { @@ -131,11 +140,18 @@ onMounted(async () => { width: 100%; background: url("@/assets/images/vehicleManagement/carNumImg.png") no-repeat; background-size: 100% 100%; + display: flex; + align-items: center; + justify-content: center; img { width: 91%; height: 86%; margin: 2% 4%; } + .noDataImg{ + width: 25%; + height: 78%; + } } .carNumTwo { margin-top: 7%;