wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

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

# Conflicts:
#	src/views/enterprise_management/basics_info_management/freight_trailer/add.vue
#	src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
dev
WenShiJun 2024-03-26 18:03:19 +08:00
parent 558799d0c9 ab68b10197
commit cf7e5686e4
11 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.env.production
View File

@ -0,0 +1,7 @@
VITE_BASE_URL=http://192.168.0.31:7082/integrated_traffic/
VITE_PROXY=/api/
VITE_FILE_URL=https://file.zcloudchina.com/YTHFile
VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/
VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/
VITE_LEARNING_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/websocket/

10
src/assets/js/constant.js
View File

@ -121,8 +121,8 @@ export const EXPIRE_STATUS = [
{ ID: "0", NAME: "已到期" }, { ID: "0", NAME: "已到期" },
]; ];
// export const MAINTENANCE_LEVEL_LIST = [ export const MAINTENANCE_LEVEL_LIST = [
// //维保等级 // 维保等级
// {ID:'1',NAME:'一级维保'}, { ID: "1", NAME: "一级维保" },
// {ID:'2',NAME:'二级维保'}, { ID: "2", NAME: "二级维保" },
// ] ];

2
src/views/enterprise_management/basics_info_management/freight_trailer/components/export_excel.vue
View File

@ -53,7 +53,7 @@ const props = defineProps({
const emits = defineEmits(["update:visible"]); const emits = defineEmits(["update:visible"]);
const visible = useVModel(props, "visible", emits); const visible = useVModel(props, "visible", emits);
const options = [ const options = [
"自编号", "编号",
"车牌号", "车牌号",
"车架号", "车架号",
"挂车类型", "挂车类型",

2
src/views/enterprise_management/basics_info_management/freight_trailer/edit.vue
View File

@ -6,7 +6,7 @@
<el-divider content-position="left">基本信息</el-divider> <el-divider content-position="left">基本信息</el-divider>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="自编号" prop="NUM"> <el-form-item label="编号" prop="NUM">
<el-input v-model="form.NUM" maxlength="50" show-word-limit /> <el-input v-model="form.NUM" maxlength="50" show-word-limit />
</el-form-item> </el-form-item>
</el-col> </el-col>

2
src/views/enterprise_management/basics_info_management/freight_trailer/view.vue
View File

@ -3,7 +3,7 @@
<div id="printContainer"> <div id="printContainer">
<el-divider content-position="left">基本信息</el-divider> <el-divider content-position="left">基本信息</el-divider>
<el-descriptions :column="2" border> <el-descriptions :column="2" border>
<el-descriptions-item label-class-name="width_200" label="自编号"> <el-descriptions-item label-class-name="width_200" label="编号">
{{ info.NUM }} {{ info.NUM }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="车牌号"> <el-descriptions-item label-class-name="width_200" label="车牌号">

2
src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
View File

@ -7,7 +7,7 @@
<el-form-item label="编号" prop="GOODSSELFNUMBER"> <el-form-item label="编号" prop="GOODSSELFNUMBER">
<el-input <el-input
v-model="form.GOODSSELFNUMBER" v-model="form.GOODSSELFNUMBER"
placeholder="请填写自编号" placeholder="请填写编号"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>

2
src/views/mechanical_files/beidou/components/export_excel.vue
View File

@ -53,7 +53,7 @@ const props = defineProps({
const emits = defineEmits(["update:visible"]); const emits = defineEmits(["update:visible"]);
const visible = useVModel(props, "visible", emits); const visible = useVModel(props, "visible", emits);
const options = [ const options = [
"自编号", "编号",
"车牌号", "车牌号",
"车架号", "车架号",
"挂车类型", "挂车类型",

2
src/views/mechanical_files/inspect_annually/components/export_excel.vue
View File

@ -53,7 +53,7 @@ const props = defineProps({
const emits = defineEmits(["update:visible"]); const emits = defineEmits(["update:visible"]);
const visible = useVModel(props, "visible", emits); const visible = useVModel(props, "visible", emits);
const options = [ const options = [
"自编号", "编号",
"车牌号", "车牌号",
"车架号", "车架号",
"挂车类型", "挂车类型",

2
src/views/mechanical_files/insure/components/export_excel.vue
View File

@ -53,7 +53,7 @@ const props = defineProps({
const emits = defineEmits(["update:visible"]); const emits = defineEmits(["update:visible"]);
const visible = useVModel(props, "visible", emits); const visible = useVModel(props, "visible", emits);
const options = [ const options = [
"自编号", "编号",
"车牌号", "车牌号",
"车架号", "车架号",
"挂车类型", "挂车类型",

2
src/views/mechanical_files/maintenance/components/export_excel.vue
View File

@ -53,7 +53,7 @@ const props = defineProps({
const emits = defineEmits(["update:visible"]); const emits = defineEmits(["update:visible"]);
const visible = useVModel(props, "visible", emits); const visible = useVModel(props, "visible", emits);
const options = [ const options = [
"自编号", "编号",
"车牌号", "车牌号",
"车架号", "车架号",
"挂车类型", "挂车类型",

2
src/views/mechanical_files/operations/components/export_excel.vue
View File

@ -53,7 +53,7 @@ const props = defineProps({
const emits = defineEmits(["update:visible"]); const emits = defineEmits(["update:visible"]);
const visible = useVModel(props, "visible", emits); const visible = useVModel(props, "visible", emits);
const options = [ const options = [
"自编号", "编号",
"车牌号", "车牌号",
"车架号", "车架号",
"挂车类型", "挂车类型",