diff --git a/.env b/.env
index ab2a573..27f9985 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-VITE_BASE_URL=http://192.168.0.42:8099/
+VITE_BASE_URL=http://192.168.0.62:8093/
VITE_PROXY=/api/
VITE_PROXY_QAAQ=/qaaq_api/
VITE_QAAQ_URL=https://gateway.qhdsafety.com/
diff --git a/src/assets/js/operation_vehicle.js b/src/assets/js/operation_vehicle.js
index 3d5fc30..72f79a8 100644
--- a/src/assets/js/operation_vehicle.js
+++ b/src/assets/js/operation_vehicle.js
@@ -3,7 +3,7 @@ import {
getDynamicSupervision, getEmissionStandard, getFnGetFuelType, getLicenseStatus,
getNetworkStatus,
getTransportationEnterprise, getTransportCategory,
- getVehicleColor
+ getVehicleColor, getVehicleType
} from "@/request/operation_vehicle.js";
import { ref } from "vue";
@@ -60,6 +60,13 @@ export const layoutFnGetBelongingDepartment = async () => {
});
return ref(resData.list);
};
+
+export const layoutFnGetVehicleType = async () => {
+ const resData = await getVehicleType({
+ DICTIONARIES_ID: "08411f2b259a45681512dfad07c4f11a",
+ });
+ return ref(resData.list);
+};
export const layoutFnGetFuelType = async () => {
const resData = await getFnGetFuelType({
DICTIONARIES_ID: "8xe11f2b259a42609512dfad07c4f11a",
diff --git a/src/request/operation_vehicle.js b/src/request/operation_vehicle.js
index c6587b3..5f8567a 100644
--- a/src/request/operation_vehicle.js
+++ b/src/request/operation_vehicle.js
@@ -48,6 +48,12 @@ export const getBelongingDepartment = (params) =>
...params,
});
+export const getVehicleType = (params) =>
+ post("/dictionaries/getVehicleType", {
+ loading: false,
+ ...params,
+ });
+
export const getFnGetFuelType = (params) =>
post("/dictionaries/getFnGetFuelType", {
loading: false,
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
index b842b75..ad7501f 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
@@ -25,7 +25,7 @@
v-for="item in getVehicleColorList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -52,7 +52,7 @@
v-for="item in getTransportationEnterpriseList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -64,7 +64,7 @@
v-for="item in getTransportCategoryList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -76,14 +76,21 @@
v-for="item in getBelongingDepartment"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
-
+
+
+
@@ -181,7 +188,7 @@
v-for="item in getFuelTypeList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -193,7 +200,7 @@
v-for="item in getEmissionStandardList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -280,6 +287,7 @@ import {
layoutFnGetBelongingDepartment,
layoutFnGetFuelType,
layoutFnGetEmissionStandard,
+ layoutFnGetVehicleType
} from "@/assets/js/operation_vehicle.js";
import {
addOperatingVehicleInfo,
@@ -354,6 +362,7 @@ const getTransportCategoryList = await layoutFnGetTransportCategory();
const getBelongingDepartment = await layoutFnGetBelongingDepartment();
const getFuelTypeList = await layoutFnGetFuelType();
const getEmissionStandardList = await layoutFnGetEmissionStandard();
+const getVehicleTypeList = await layoutFnGetVehicleType();
const fnSubmit = debounce(
1000,
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
index 762b25f..d43738c 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
@@ -25,7 +25,7 @@
v-for="item in getVehicleColorList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -52,7 +52,7 @@
v-for="item in getTransportationEnterpriseList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -64,7 +64,7 @@
v-for="item in getTransportCategoryList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -76,14 +76,21 @@
v-for="item in getBelongingDepartment"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
-
+
+
+
@@ -181,7 +188,7 @@
v-for="item in getFuelTypeList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -193,7 +200,7 @@
v-for="item in getEmissionStandardList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -280,6 +287,7 @@ import {
layoutFnGetBelongingDepartment,
layoutFnGetFuelType,
layoutFnGetEmissionStandard,
+ layoutFnGetVehicleType
} from "@/assets/js/operation_vehicle.js";
import {
findByIdOperatingVehicleInfo,
@@ -362,6 +370,7 @@ const getTransportCategoryList = await layoutFnGetTransportCategory();
const getBelongingDepartment = await layoutFnGetBelongingDepartment();
const getFuelTypeList = await layoutFnGetFuelType();
const getEmissionStandardList = await layoutFnGetEmissionStandard();
+const getVehicleTypeList = await layoutFnGetVehicleType();
const fnGetData = async () => {
if(OPERATING_ID) {
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
index 53ab404..76bf2af 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
@@ -22,7 +22,7 @@
v-for="item in troubleshootingCycleList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -61,7 +61,7 @@
v-for="item in enterpriseLevelList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -74,7 +74,7 @@
v-for="item in networkStatusLevelList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -87,7 +87,7 @@
v-for="item in dynamicSupervision"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -100,7 +100,7 @@
v-for="item in activeSafety"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -113,7 +113,7 @@
v-for="item in licenseStatus"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -157,7 +157,7 @@
-
+
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
index 3ac1c73..43f8d7b 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
@@ -12,8 +12,7 @@
{{ data.FRAMES_NUMBER }}
- 黄色
- 黑色
+ {{ data.VEHICLE_COLOR }}
{{ data.ENGINE_NUMBER }}
@@ -58,9 +57,7 @@
{{ data.EXPIRE_DATE }}
-
- 唐山中胜运输服务有限公司
-
+ {{ data.TRANSPORT_ENTERPRISES }}
车辆状态
@@ -91,12 +88,10 @@
{{ data.VEHICLE_MODEL }}
- 液化天然气(LNG)
+ {{ data.FUEL_TYPE }}
-
- 国Ⅴ
-
+ {{ data.EMISSION_STANDARD }}
{{ data.VOUCH_TOTALMASS }}
@@ -108,12 +103,7 @@
{{ data.RACTIONMASS_QUALITY }}
-
- 危险货物运输(2类2项)
-
-
- 第2类压缩液化气体
-
+ {{ data.TRANSPORT_TYPE }}