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

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

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

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

@ -3,13 +3,13 @@
<div id="printContent"> <div id="printContent">
<table class="archive_print_table"> <table class="archive_print_table">
<thead> <thead>
<tr> <tr>
<td colspan="10" style="border: none"> <td colspan="10" style="border: none">
<el-divider content-position="left"> <el-divider content-position="left">
{{data.info.TRANSPORTVEHICLE}}车辆行车三检日志 {{ data.info.TRANSPORTVEHICLE }}车辆行车三检日志
</el-divider> </el-divider>
</td> </td>
</tr> </tr>
</thead> </thead>
<tr> <tr>
<td class="title">运单编号</td> <td class="title">运单编号</td>
@ -57,59 +57,58 @@
<tr v-for="(item, index) in data.info.varList" :key="index"> <tr v-for="(item, index) in data.info.varList" :key="index">
<td :rowspan="1" class="title">{{ item.CHECKTYPE_NAME }}检查</td> <td :rowspan="1" class="title">{{ item.CHECKTYPE_NAME }}检查</td>
<td colspan="8"> <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> <tr>
<td :rowspan="10" class="title">检查记录</td> <td :rowspan="10" class="title">检查记录</td>
</tr> </tr>
<tr v-for="(item2,index2) in item1.pd2Children" :key="index2"> <tr v-for="(item2, index2) in item1.pd2Children" :key="index2">
<td class="title">检查项名称</td> <td class="title">检查项名称</td>
<td>{{item2.CHECKITEMNAME}}</td> <td>{{ item2.CHECKITEMNAME }}</td>
<td class="title">检查项说明</td> <td class="title">检查项说明</td>
<td>{{item2.REMARKS}}</td> <td>{{ item2.REMARKS }}</td>
</tr> </tr>
<tr> <tr>
<td class="title">检查人</td> <td class="title">检查人</td>
<td> <td>
<img <img
v-viewer v-viewer
:src="VITE_FILE_URL + item1.SIGN_PATH" :src="VITE_FILE_URL + item1.SIGN_PATH"
alt="" alt=""
width="20" width="20"
height="20" height="20"
class="mr-10 mt-10" class="mr-10 mt-10"
/> />
</td> </td>
<td class="title">检查时间</td> <td class="title">检查时间</td>
<td>{{item1.SIGN_TIME}}</td> <td>{{ item1.SIGN_TIME }}</td>
</tr> </tr>
<tr> <tr>
<td class="title">检查照片</td> <td class="title">检查照片</td>
<td colspan="3"> <td colspan="3">
<div> <div>
<template <template
v-for="(item3, index3) in item1.IMG_PATH.split(',')" v-for="(item3, index3) in item1.IMG_PATH.split(',')"
:key="index3" :key="index3"
> >
<img <img
v-viewer v-viewer
:src="VITE_FILE_URL + item3" :src="VITE_FILE_URL + item3"
alt="" alt=""
width="20" width="20"
height="20" height="20"
class="mr-10 mt-10" class="mr-10 mt-10"
/> />
</template> </template>
</div> </div>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</layout-card> </layout-card>
@ -118,7 +117,7 @@
<script setup> <script setup>
import { reactive } from "vue"; import { reactive } from "vue";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import {getSafetyDrivingLogView} from "@/request/traffic_driving_log.js"; import { getSafetyDrivingLogView } from "@/request/traffic_driving_log.js";
const VITE_FILE_URL = import.meta.env.VITE_FILE_URL; const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
const route = useRoute(); const route = useRoute();
@ -131,7 +130,6 @@ const fnGetData = async () => {
const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID }); const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
data.info = resData.pd; data.info = resData.pd;
data.commitmentList = resData.commitmentList; data.commitmentList = resData.commitmentList;
}; };
fnGetData(); fnGetData();
</script> </script>

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

@ -2,32 +2,31 @@
<div> <div>
<el-card> <el-card>
<el-form <el-form
:model="searchForm" :model="searchForm"
label-width="100px" label-width="100px"
@submit.prevent="fnResetPaginationTransfer" @submit.prevent="fnResetPaginationTransfer"
> >
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="运输车辆" prop="TRANSPORTVEHICLE"> <el-form-item label="运输车辆" prop="TRANSPORTVEHICLE">
<el-input <el-input
v-model="searchForm.TRANSPORTVEHICLE" v-model="searchForm.TRANSPORTVEHICLE"
placeholder="请输入运输车辆" placeholder="请输入运输车辆"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="状态" prop="STEP_ID">--> <!-- <el-form-item label="状态" prop="STEP_ID">-->
<!-- <el-select v-model="searchForm.STEP_ID">--> <!-- <el-select v-model="searchForm.STEP_ID">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in stepList"--> <!-- v-for="item in stepList"-->
<!-- :key="item.STEP_ID"--> <!-- :key="item.STEP_ID"-->
<!-- :label="item.STEP_NAME"--> <!-- :label="item.STEP_NAME"-->
<!-- :value="item.STEP_ID"--> <!-- :value="item.STEP_ID"-->
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="10px"> <el-form-item label-width="10px">
@ -42,17 +41,17 @@
</el-card> </el-card>
<layout-card> <layout-card>
<layout-table <layout-table
v-model:pagination="pagination" v-model:pagination="pagination"
:data="list" :data="list"
@get-data="fnGetData" @get-data="fnGetData"
> >
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template #default="{ $index }"> <template #default="{ $index }">
{{ serialNumber(pagination, $index) }} {{ serialNumber(pagination, $index) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="WAYBILLNUMBER" label="运单编号" width="230"/> <el-table-column prop="WAYBILLNUMBER" label="运单编号" width="230" />
<el-table-column label="行车状态" width="130" > <el-table-column label="行车状态" width="130">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.WAYBILLSTATUS === '0'">未出发</el-tag> <el-tag v-if="row.WAYBILLSTATUS === '0'">未出发</el-tag>
<el-tag v-else-if="row.WAYBILLSTATUS === '1'">已出发</el-tag> <el-tag v-else-if="row.WAYBILLSTATUS === '1'">已出发</el-tag>
@ -67,28 +66,28 @@
<el-table-column label="操作" width="180"> <el-table-column label="操作" width="180">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
type="primary" type="primary"
text text
link link
@click=" @click="
router.push({ router.push({
path: '/driving_inspections/driving_log/drivingLog_info', path: '/driving_inspections/driving_log/drivingLog_info',
query: { query: {
WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID,
}, },
}) })
" "
> >
查看 查看
</el-button> </el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- type="danger"--> <!-- type="danger"-->
<!-- text--> <!-- text-->
<!-- link--> <!-- link-->
<!-- @click="deleteItem(row.WAYBILLREGISTRATION_ID)"--> <!-- @click="deleteItem(row.WAYBILLREGISTRATION_ID)"-->
<!-- >--> <!-- >-->
<!-- 删除--> <!-- 删除-->
<!-- </el-button>--> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</layout-table> </layout-table>
@ -104,7 +103,7 @@ import { getSafetyDrivingLogList } from "@/request/traffic_driving_log.js";
const router = useRouter(); const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } = const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getSafetyDrivingLogList); useListData(getSafetyDrivingLogList);
const fnResetPaginationTransfer = () => { const fnResetPaginationTransfer = () => {
fnResetPagination({ fnResetPagination({
@ -113,7 +112,6 @@ const fnResetPaginationTransfer = () => {
WORK_START_DATE: searchForm.value.WORK_START_DATE, WORK_START_DATE: searchForm.value.WORK_START_DATE,
}); });
}; };
</script> </script>
<style scoped></style> <style scoped></style>

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

@ -11,10 +11,10 @@
<el-form-item label="检查项类型" prop="CHECKTYPE_ID"> <el-form-item label="检查项类型" prop="CHECKTYPE_ID">
<el-select v-model="searchForm.CHECKTYPE_ID"> <el-select v-model="searchForm.CHECKTYPE_ID">
<el-option <el-option
v-for="item in drivingTypeList" v-for="item in drivingTypeList"
:key="item.BIANMA" :key="item.BIANMA"
:label="item.NAME" :label="item.NAME"
:value="item.BIANMA" :value="item.BIANMA"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -42,23 +42,18 @@
{{ serialNumber(pagination, $index) }} {{ serialNumber(pagination, $index) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="CHECKITEMNAME" label="检查项名称" width="330" />
prop="CHECKITEMNAME"
label="检查项名称"
width="330"
/>
<el-table-column prop="CHECKTYPE_NAME" label="检查项类型" width="230" /> <el-table-column prop="CHECKTYPE_NAME" label="检查项类型" width="230" />
<el-table-column prop="REMARKS" label="检查项说明" width="330" /> <el-table-column prop="REMARKS" label="检查项说明" width="330" />
<el-table-column prop="CREATTIME" label="创建时间" width="230" /> <el-table-column prop="CREATTIME" label="创建时间" width="230" />
<el-table-column prop="OPERATTIME" label="修改时间" width="230" /> <el-table-column prop="OPERATTIME" label="修改时间" width="230" />
<el-table-column label="操作" > <el-table-column label="操作">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
type="primary" type="primary"
text text
link link
@click="fnAddOrEdit(row.DRIVINGTYPE_ID, 'edit')" @click="fnAddOrEdit(row.DRIVINGTYPE_ID, 'edit')"
> >
修改 修改
</el-button> </el-button>
@ -73,20 +68,17 @@
</template> </template>
</el-table-column> </el-table-column>
<template #button> <template #button>
<el-button <el-button type="primary" @click="fnAddOrEdit('', 'add')">
type="primary"
@click="fnAddOrEdit('', 'add')"
>
新增 新增
</el-button> </el-button>
</template> </template>
</layout-table> </layout-table>
</layout-card> </layout-card>
<add <add
v-model:visible="data.addOrEditDialog.visible" v-model:visible="data.addOrEditDialog.visible"
v-model:form="data.addOrEditDialog.form" v-model:form="data.addOrEditDialog.form"
:type="data.addOrEditDialog.type" :type="data.addOrEditDialog.type"
@get-data="fnResetPagination" @get-data="fnResetPagination"
/> />
</div> </div>
</template> </template>
@ -94,14 +86,15 @@
<script setup> <script setup>
import { serialNumber } from "@/assets/js/utils"; import { serialNumber } from "@/assets/js/utils";
import useListData from "@/assets/js/useListData.js"; import useListData from "@/assets/js/useListData.js";
import { nextTick,reactive } from "vue"; import { nextTick, reactive } from "vue";
import Add from "./components/add.vue"; import Add from "./components/add.vue";
import { import {
getSafetyDrivingTypeList, getSafetyDrivingTypeView, getSafetyDrivingTypeList,
getSafetyDrivingTypeView,
setDrivingTypeDelete, setDrivingTypeDelete,
} from "@/request/traffic_driving_type.js"; } from "@/request/traffic_driving_type.js";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
import {layoutFnGetDrivingType} from "@/assets/js/data_dictionary.js"; import { layoutFnGetDrivingType } from "@/assets/js/data_dictionary.js";
const { list, pagination, searchForm, fnGetData, fnResetPagination } = const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getSafetyDrivingTypeList); useListData(getSafetyDrivingTypeList);
@ -136,7 +129,6 @@ const deleteItem = async (value) => {
fnGetData(); fnGetData();
}; };
const drivingTypeList = await layoutFnGetDrivingType(); const drivingTypeList = await layoutFnGetDrivingType();
</script> </script>

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

@ -29,7 +29,7 @@
<el-input v-model="data.form.CODE" placeholder="请输入内容" /> <el-input v-model="data.form.CODE" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="市行业监管部门" prop="INDUSTRY_DEPARTMENTName"> <el-form-item label="市行业监管部门" prop="INDUSTRY_DEPARTMENTName">
<el-input <el-input
v-model="data.form.INDUSTRY_DEPARTMENTName" v-model="data.form.INDUSTRY_DEPARTMENTName"
@ -47,7 +47,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="监管类型" prop="REGULARTYPE"> <el-form-item label="监管类型" prop="REGULARTYPE">
<layout-regulatory-type <layout-regulatory-type
v-model="data.form.REGULARTYPE" v-model="data.form.REGULARTYPE"
@ -449,7 +449,6 @@
<script setup> <script setup>
import { reactive, ref } from "vue"; import { reactive, ref } from "vue";
import LayoutTerritory from "@/components/territory/index.vue"; import LayoutTerritory from "@/components/territory/index.vue";
import LayoutRegulatoryType from "@/components/regulatory_type/index.vue";
import LayoutIndustry from "@/components/industry/index.vue"; import LayoutIndustry from "@/components/industry/index.vue";
import LayoutEconomicType from "@/components/economic_type/index.vue"; import LayoutEconomicType from "@/components/economic_type/index.vue";
import LayoutLearningTrainType from "@/components/learning_train_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> </template>
<script setup> <script setup>
import { import { getUserListAll } from "@/request/safety_production_related.js";
layoutFnGetMEETINGTYPEClassification,
getUserListAll,
} from "@/request/safety_production_related.js";
import { addSafetyMeetingView } from "@/request/traffic_safety_meeting.js"; import { addSafetyMeetingView } from "@/request/traffic_safety_meeting.js";
import { reactive, ref } from "vue"; import { reactive, ref } from "vue";
import LayoutUpload from "@/components/upload/index.vue"; import LayoutUpload from "@/components/upload/index.vue";
@ -162,12 +159,6 @@ const fnGetUnitsList = async () => {
data.unitsList = resData.varList; data.unitsList = resData.varList;
}; };
fnGetUnitsList(); 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({ const data = reactive({
form: { form: {

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