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

部署异常修复

dev
wangpeng 2024-03-25 09:27:54 +08:00
parent 9684793f2d
commit b098bf7dcd
7 changed files with 110 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/driving_inspections/driving_commitment/index.vue
View File

@ -35,17 +35,16 @@
{{ serialNumber(pagination, $index) }}
</template>
</el-table-column>
<el-table-column prop="INQUIRYCONTENT" label="问询内容" width="330" />
<el-table-column
prop="INQUIRYCONTENT"
label="问询内容"
width="330"
prop="INQUIRYCONCLUSION"
label="问询结果"
width="230"
/>
<el-table-column prop="INQUIRYCONCLUSION" label="问询结果" width="230" />
<el-table-column prop="CREATTIME" label="创建时间" width="130" />
<el-table-column prop="OPERATTIME" label="修改时间" width="130" />
<el-table-column label="操作">
<template #default="{ row }">
<el-button
type="primary"
text
@ -65,10 +64,7 @@
</template>
</el-table-column>
<template #button>
<el-button
type="primary"
@click="fnAddOrEdit('', 'add')"
>
<el-button type="primary" @click="fnAddOrEdit('', 'add')">
新增
</el-button>
</template>
@ -89,7 +85,8 @@ import useListData from "@/assets/js/useListData.js";
import { nextTick, reactive } from "vue";
import Add from "./components/add.vue";
import {
getSafetyDrivingCommitmentList, getSafetyDrivingCommitmentView,
getSafetyDrivingCommitmentList,
getSafetyDrivingCommitmentView,
setDrivingCommitmentDelete,
} from "@/request/traffic_driving_commitment.js";
import { ElMessage, ElMessageBox } from "element-plus";
@ -111,7 +108,9 @@ const fnAddOrEdit = async (DRIVINGCOMMITMENT_ID, type) => {
await nextTick();
data.addOrEditDialog.type = type;
if (type === "edit") {
const resData = await getSafetyDrivingCommitmentView({ DRIVINGCOMMITMENT_ID });
const resData = await getSafetyDrivingCommitmentView({
DRIVINGCOMMITMENT_ID,
});
data.addOrEditDialog.form = resData.pd;
}
};

12
src/views/driving_inspections/driving_log/drivingLog_info.vue
View File

@ -57,7 +57,11 @@
<tr v-for="(item, index) in data.info.varList" :key="index">
<td :rowspan="1" class="title">{{ item.CHECKTYPE_NAME }}检查</td>
<td colspan="8">
<table class="archive_print_table" v-for="(item1,index1) in item.pd1Children" :key="index1">
<table
v-for="(item1, index1) in item.pd1Children"
:key="index1"
class="archive_print_table"
>
<tr>
<td :rowspan="10" class="title">检查记录</td>
</tr>
@ -99,17 +103,12 @@
class="mr-10 mt-10"
/>
</template>
</div>
</td>
</tr>
</table>
</td>
</tr>
</table>
</div>
</layout-card>
@ -131,7 +130,6 @@ const fnGetData = async () => {
const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
data.info = resData.pd;
data.commitmentList = resData.commitmentList;
};
fnGetData();
</script>

4
src/views/driving_inspections/driving_log/index.vue
View File

@ -28,7 +28,6 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label-width="10px">
<el-button type="primary" native-type="submit">搜索</el-button>
@ -74,7 +73,7 @@
router.push({
path: '/driving_inspections/driving_log/drivingLog_info',
query: {
WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID
WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID,
},
})
"
@ -113,7 +112,6 @@ const fnResetPaginationTransfer = () => {
WORK_START_DATE: searchForm.value.WORK_START_DATE,
});
};
</script>
<style scoped></style>

16
src/views/driving_inspections/driving_type/index.vue
View File

@ -42,18 +42,13 @@
{{ serialNumber(pagination, $index) }}
</template>
</el-table-column>
<el-table-column
prop="CHECKITEMNAME"
label="检查项名称"
width="330"
/>
<el-table-column prop="CHECKITEMNAME" label="检查项名称" width="330" />
<el-table-column prop="CHECKTYPE_NAME" label="检查项类型" width="230" />
<el-table-column prop="REMARKS" label="检查项说明" width="330" />
<el-table-column prop="CREATTIME" label="创建时间" width="230" />
<el-table-column prop="OPERATTIME" label="修改时间" width="230" />
<el-table-column label="操作">
<template #default="{ row }">
<el-button
type="primary"
text
@ -73,10 +68,7 @@
</template>
</el-table-column>
<template #button>
<el-button
type="primary"
@click="fnAddOrEdit('', 'add')"
>
<el-button type="primary" @click="fnAddOrEdit('', 'add')">
新增
</el-button>
</template>
@ -97,7 +89,8 @@ import useListData from "@/assets/js/useListData.js";
import { nextTick, reactive } from "vue";
import Add from "./components/add.vue";
import {
getSafetyDrivingTypeList, getSafetyDrivingTypeView,
getSafetyDrivingTypeList,
getSafetyDrivingTypeView,
setDrivingTypeDelete,
} from "@/request/traffic_driving_type.js";
import { ElMessage, ElMessageBox } from "element-plus";
@ -136,7 +129,6 @@ const deleteItem = async (value) => {
fnGetData();
};
const drivingTypeList = await layoutFnGetDrivingType();
</script>

1
src/views/enterprise_management/information/edit.vue
View File

@ -449,7 +449,6 @@
<script setup>
import { reactive, ref } from "vue";
import LayoutTerritory from "@/components/territory/index.vue";
import LayoutRegulatoryType from "@/components/regulatory_type/index.vue";
import LayoutIndustry from "@/components/industry/index.vue";
import LayoutEconomicType from "@/components/economic_type/index.vue";
import LayoutLearningTrainType from "@/components/learning_train_type/index.vue";

11
src/views/safety_production_related/driving_log/add.vue
View File

@ -113,10 +113,7 @@
</template>
<script setup>
import {
layoutFnGetMEETINGTYPEClassification,
getUserListAll,
} from "@/request/safety_production_related.js";
import { getUserListAll } from "@/request/safety_production_related.js";
import { addSafetyMeetingView } from "@/request/traffic_safety_meeting.js";
import { reactive, ref } from "vue";
import LayoutUpload from "@/components/upload/index.vue";
@ -162,12 +159,6 @@ const fnGetUnitsList = async () => {
data.unitsList = resData.varList;
};
fnGetUnitsList();
const relatedClassificationTempList =
await layoutFnGetMEETINGTYPEClassification();
const relatedClassificationList = [];
JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
relatedClassificationList.push({ name: e.id, BIANMA: e.name });
});
const data = reactive({
form: {

0
src/views/safety_production_related/things_check/index.vue
View File