java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

优化配载图片

dev
qb 4 months ago
parent
1c119248c1
commit
e9f7c9a4b1
5 changed files with 130 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/utils/print.js
  2. 20
      src/views/desk/DataBoard.vue
  3. 15
      src/views/distribution/artery/VehicleArrivalManagement.vue
  4. 163
      src/views/distribution/artery/VehicleNodeImgs.vue
  5. 1
      src/views/distribution/artery/VehicleStowage.vue

14
src/utils/print.js
Unescape View File

@ -47,6 +47,13 @@ const print = (nodeList, type = 'deliveryPrint') => {
// 初始化打印实例 // 初始化打印实例
let LODOP = getLodop(); let LODOP = getLodop();
// const _count = LODOP.GET_PRINTER_COUNT();
// for (let index = 0; index < _count; index++) {
// const name = LODOP.GET_PRINTER_NAME(index);
// console.log('name :>> ', name);
// }
// 当列表内没有元素时, 退出函数 // 当列表内没有元素时, 退出函数
if (nodeList.length === 0) return; if (nodeList.length === 0) return;
@ -68,13 +75,6 @@ const print = (nodeList, type = 'deliveryPrint') => {
const newPrint = nodeName => { const newPrint = nodeName => {
if (nodeName) return hwyPrintNew(nodeName); if (nodeName) return hwyPrintNew(nodeName);
// const nodeList = document.querySelectorAll('.el-dialog__body>div>div>div')
// for (const iterator of nodeList) {
// //$Print(iterator)
// console.log(iterator, 'iterator');
// }
hwyPrintNew('.el-dialog__body>div>div>div'); hwyPrintNew('.el-dialog__body>div>div>div');
}; };

20
src/views/desk/DataBoard.vue
Unescape View File

@ -905,13 +905,13 @@
() => () =>
handleDetails('trunklineCarsDataColumn', '干线车次统计 - 在途 - 车', { handleDetails('trunklineCarsDataColumn', '干线车次统计 - 在途 - 车', {
tip: '在途', tip: '在途',
prop: 'inTransitNum', prop: 'onTheWayNum',
}) })
" "
> >
<div class="data_box mb10"> <div class="data_box mb10">
<div class="data mr5px underline"> <div class="data mr5px underline">
{{ details.trunklineCarsDataInfo.inTransitNum || 0 }} {{ details.trunklineCarsDataInfo.onTheWayNum || 0 }}
</div> </div>
<div class="">车</div> <div class="">车</div>
</div> </div>
@ -926,13 +926,13 @@
() => () =>
handleDetails('trunklineCarsDataColumn', '干线车次统计 - 作业 - 车', { handleDetails('trunklineCarsDataColumn', '干线车次统计 - 作业 - 车', {
tip: '作业', tip: '作业',
prop: 'workNum', prop: 'workingNum',
}) })
" "
> >
<div class="data_box mb10"> <div class="data_box mb10">
<div class="data mr5px underline"> <div class="data mr5px underline">
{{ details.trunklineCarsDataInfo.workNum || 0 }} {{ details.trunklineCarsDataInfo.workingNum || 0 }}
</div> </div>
<div class="">车</div> <div class="">车</div>
</div> </div>
@ -947,13 +947,13 @@
() => () =>
handleDetails('trunklineCarsDataColumn', '干线车次统计 - 卸车完成 - 车', { handleDetails('trunklineCarsDataColumn', '干线车次统计 - 卸车完成 - 车', {
tip: '卸车完成', tip: '卸车完成',
prop: 'unloadNum', prop: 'unloadCompleteNum',
}) })
" "
> >
<div class="data_box mb10"> <div class="data_box mb10">
<div class="data mr5px underline"> <div class="data mr5px underline">
{{ details.trunklineCarsDataInfo.unloadNum || 0 }} {{ details.trunklineCarsDataInfo.unloadCompleteNum || 0 }}
</div> </div>
<div class="">车</div> <div class="">车</div>
</div> </div>
@ -1841,10 +1841,10 @@ const details = reactive({
}, },
/** 干线车次数据 */ /** 干线车次数据 */
trunklineCarsDataInfo: { trunklineCarsDataInfo: {
inTransitNum: 0, onTheWayNum: 0,
totalNum: 0, totalNum: 0,
unloadNum: 0, unloadCompleteNum: 0,
workNum: 0, workingNum: 0,
}, },
/** 异常卸车数据 */ /** 异常卸车数据 */
unloadAbnormalDataInfo: { unloadAbnormalDataInfo: {
@ -2136,7 +2136,7 @@ const initTrunklineHandOrderData = async () => {
/** 请求干线车次数据 */ /** 请求干线车次数据 */
const initTrunklineCarsData = async () => { const initTrunklineCarsData = async () => {
const _obj: any = {}; const _obj: any = {};
const _keyArr = ['inTransitNum', 'totalNum', 'unloadNum', 'workNum']; const _keyArr = ['onTheWayNum', 'totalNum', 'unloadCompleteNum', 'workingNum'];
for (let i = 0; i < _keyArr.length; i++) { for (let i = 0; i < _keyArr.length; i++) {
const value = _keyArr[i]; const value = _keyArr[i];

15
src/views/distribution/artery/VehicleArrivalManagement.vue
Unescape View File

@ -397,9 +397,9 @@
</el-dropdown-item> </el-dropdown-item>
<!-- 配载图片 --> <!-- 配载图片 -->
<!-- <el-dropdown-item> <el-dropdown-item>
<el-text @click="handleShowVehicleImgs(slotProps.scope)"> 配载图片 </el-text> <el-text @click="handleShowVehicleImgs(slotProps.scope)"> 配载图片 </el-text>
</el-dropdown-item> --> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>
@ -1870,6 +1870,17 @@ const handleExportAbnormal = () => {
const time = new Date().getTime(); const time = new Date().getTime();
exportExcelByDom(abnormalOrderTableNode.value.$el, '异常数据' + ' - ' + time + '.xlsx'); exportExcelByDom(abnormalOrderTableNode.value.$el, '异常数据' + ' - ' + time + '.xlsx');
}; };
/** 配载图片 */
const handleShowVehicleImgs = ({ row }) => {
$router.push({
path: '/distribution/artery/VehicleNodeImgs',
query: {
name: `${row.carsNo} - 节点图片`,
loadId: row.id,
},
});
};
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

163
src/views/distribution/artery/VehicleNodeImgs.vue
Unescape View File

@ -10,7 +10,7 @@
:key="item.nodeId" :key="item.nodeId"
:class="{ :class="{
VehicleLineNode_item: true, VehicleLineNode_item: true,
notActive: false, notActive: details.nowWarehoseIndex < index,
choose: details.activeIndex === index, choose: details.activeIndex === index,
}" }"
@click="() => handleCheckNode(item, index)" @click="() => handleCheckNode(item, index)"
@ -34,74 +34,83 @@
<!-- 图片容器 --> <!-- 图片容器 -->
<div class="VehicleLineImgs_container"> <div class="VehicleLineImgs_container">
<div class="mb20 align-center"> <!-- 装车前图片 -->
<div class="VehicleLineImgs_container_title">装车前图片</div> <template v-if="details.activeIndex !== details.loadLineArr.length - 1">
<div class="mb20 align-center">
<div class="VehicleLineImgs_container_title">装车前图片</div>
<el-button <el-button
type="primary" type="primary"
icon="edit" icon="edit"
@click="() => handleEdit('beforeLoad', beforeLoadImgArr, '装车前图片')" @click="() => handleEdit('beforeLoad', beforeLoadImgArr, '装车前图片')"
v-if="details.myWarehouseId === details.loadLineArr[details.activeIndex]?.nodeId"
>
编辑
</el-button>
</div>
<div
class="VehicleLineImgs_container_list mb20"
v-for="(item, index) in beforeLoadImgArr"
:key="item.type + '-' + item.position"
> >
编辑 <div class="title">{{ item.title }}</div>
</el-button>
</div>
<div
class="VehicleLineImgs_container_list mb20"
v-for="(item, index) in beforeLoadImgArr"
:key="item.type + '-' + item.position"
>
<div class="title">{{ item.title }}</div>
<div class="item"> <div class="item">
<el-image <el-image
v-for="(value, i) in item.imgArr" v-for="(value, i) in item.imgArr"
:key="value.url" :key="value.url"
style="width: 150px; height: 150px; margin: 5px; border-radius: 5px" style="width: 150px; height: 150px; margin: 5px; border-radius: 5px"
:src="value.url" :src="value.url"
:zoom-rate="1.2" :zoom-rate="1.2"
:max-scale="7" :max-scale="7"
:min-scale="0.2" :min-scale="0.2"
:preview-src-list="item.imgArr.map(val => val.url)" :preview-src-list="item.imgArr.map(val => val.url)"
:initial-index="i" :initial-index="i"
fit="cover" fit="cover"
/> />
</div>
</div> </div>
</div> </template>
<div class="mb20 align-center"> <!-- 发车前图片 -->
<div class="VehicleLineImgs_container_title">发车前图片</div> <template v-if="details.activeIndex !== details.loadLineArr.length - 1">
<div class="mb20 align-center">
<div class="VehicleLineImgs_container_title">发车前图片</div>
<el-button <el-button
type="primary" type="primary"
icon="edit" icon="edit"
@click="() => handleEdit('boforeStart', boforeStartImgArr, '发车前图片')" @click="() => handleEdit('boforeStart', boforeStartImgArr, '发车前图片')"
v-if="details.myWarehouseId === details.loadLineArr[details.activeIndex]?.nodeId"
>
编辑
</el-button>
</div>
<div
class="VehicleLineImgs_container_list mb20"
v-for="(item, index) in boforeStartImgArr"
:key="item.type + '-' + item.position"
> >
编辑 <div class="title">{{ item.title }}</div>
</el-button>
</div>
<div
class="VehicleLineImgs_container_list mb20"
v-for="(item, index) in boforeStartImgArr"
:key="item.type + '-' + item.position"
>
<div class="title">{{ item.title }}</div>
<div class="item"> <div class="item">
<el-image <el-image
v-for="(value, i) in item.imgArr" v-for="(value, i) in item.imgArr"
:key="value.url" :key="value.url"
style="width: 150px; height: 150px; margin: 5px; border-radius: 5px" style="width: 150px; height: 150px; margin: 5px; border-radius: 5px"
:src="value.url" :src="value.url"
:zoom-rate="1.2" :zoom-rate="1.2"
:max-scale="7" :max-scale="7"
:min-scale="0.2" :min-scale="0.2"
:preview-src-list="item.imgArr.map(val => val.url)" :preview-src-list="item.imgArr.map(val => val.url)"
:initial-index="i" :initial-index="i"
fit="cover" fit="cover"
/> />
</div>
</div> </div>
</div> </template>
<!-- 卸车前图片 -->
<template v-if="details.activeIndex !== 0"> <template v-if="details.activeIndex !== 0">
<div class="mb20 align-center"> <div class="mb20 align-center">
<div class="VehicleLineImgs_container_title">卸车前图片</div> <div class="VehicleLineImgs_container_title">卸车前图片</div>
@ -110,6 +119,7 @@
type="primary" type="primary"
icon="edit" icon="edit"
@click="() => handleEdit('beforeUnload', beforeUnloadImgArr, '卸车前图片')" @click="() => handleEdit('beforeUnload', beforeUnloadImgArr, '卸车前图片')"
v-if="details.myWarehouseId === details.loadLineArr[details.activeIndex]?.nodeId"
> >
编辑 编辑
</el-button> </el-button>
@ -205,7 +215,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue'; import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
/** 获取字典 */ /** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import { deepClone, getObjType, ChecksWhetherTheWarehouseIsSelected } from '@/utils/util'; import { deepClone, getObjType, ChecksWhetherTheWarehouseIsSelected } from '@/utils/util';
@ -243,6 +253,7 @@ type ImgArr = {
type LoadItme = { type LoadItme = {
nodeName?: string; nodeName?: string;
nodeId?: string; nodeId?: string;
nowWarehouseId?: string;
/** 装车前图片 */ /** 装车前图片 */
beforeLoadImgArr?: ImgArr; beforeLoadImgArr?: ImgArr;
/** 发车前图片 */ /** 发车前图片 */
@ -263,6 +274,7 @@ const details = reactive({
title: '', title: '',
loadLineArr: [] as LoadItme[], loadLineArr: [] as LoadItme[],
activeIndex: 0, activeIndex: 0,
nowWarehoseIndex: 0,
/** 提交类型 */ /** 提交类型 */
editType: 'beforeLoad' as 'beforeLoad' | 'boforeStart' | 'beforeUnload', editType: 'beforeLoad' as 'beforeLoad' | 'boforeStart' | 'beforeUnload',
/** 回显数据 */ /** 回显数据 */
@ -288,6 +300,8 @@ const details = reactive({
headers: { headers: {
'Blade-Auth': 'bearer ' + getToken(), 'Blade-Auth': 'bearer ' + getToken(),
}, },
/** 当前用户选择的仓库 */
myWarehouseId: '',
}); });
// 装车前 // 装车前
@ -363,6 +377,15 @@ const handleAddImg = (arr, addArr, isHavePosition = true) => {
} }
}; };
/** 获取当前用户的仓库id */
const getWarehouseId = () => {
const myData = JSON.parse(localStorage.getItem('my_data') || '') || {};
details.myWarehouseId = myData.id;
};
getWarehouseId();
/** 配载图片显示 */ /** 配载图片显示 */
const initImgList = async () => { const initImgList = async () => {
try { try {
@ -373,11 +396,13 @@ const initImgList = async () => {
details.loadLineArr = []; details.loadLineArr = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
const value = data[i]; const value = data[i];
const { loadingObject, startObject, unloadObject, carsLoadLineEntity } = value; const { loadingObject, startObject, unloadObject, carsLoadLineEntity, nowWarehouseId } =
value;
const _obj: LoadItme = { const _obj: LoadItme = {
nodeId: '', nodeId: '',
nodeName: '', nodeName: '',
nowWarehouseId: '',
beforeLoadImgArr: [ beforeLoadImgArr: [
{ {
title: '车厢卫生', title: '车厢卫生',
@ -468,6 +493,12 @@ const initImgList = async () => {
if (getObjType(carsLoadLineEntity) === 'object') { if (getObjType(carsLoadLineEntity) === 'object') {
_obj.nodeName = carsLoadLineEntity.nodeName; _obj.nodeName = carsLoadLineEntity.nodeName;
_obj.nodeId = carsLoadLineEntity.nodeId; _obj.nodeId = carsLoadLineEntity.nodeId;
_obj.nowWarehouseId = nowWarehouseId;
if (details.myWarehouseId === _obj.nodeId) {
details.nowWarehoseIndex = i;
details.activeIndex = i;
}
} else { } else {
ElMessage.warning('存在异常节点信息'); ElMessage.warning('存在异常节点信息');
return; return;
@ -498,9 +529,10 @@ const initImgList = async () => {
} }
}; };
initImgList(); // initImgList();
const handleCheckNode = (item, index) => { const handleCheckNode = (item, index) => {
if (details.nowWarehoseIndex < index) return;
details.activeIndex = index; details.activeIndex = index;
}; };
@ -643,6 +675,8 @@ const handleEditSubmit = async () => {
details.loadingObj.imgEdit = false; details.loadingObj.imgEdit = false;
} }
}; };
watch(() => $route.fullPath, initImgList, { immediate: true });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -681,7 +715,7 @@ const handleEditSubmit = async () => {
// 节点 // 节点
.VehicleLineNode_item { .VehicleLineNode_item {
$transition: all 0.3s; $transition: all 1s;
$activeColor: #0bc80b; $activeColor: #0bc80b;
$disabled: #808080 !important ; $disabled: #808080 !important ;
@ -702,8 +736,9 @@ const handleEditSubmit = async () => {
} }
.VehicleLineNode_item_container { .VehicleLineNode_item_container {
background-color: #fff !important; background-color: #f5f7fa !important;
cursor: no-drop; cursor: no-drop;
border-radius: 0;
} }
} }

1
src/views/distribution/artery/VehicleStowage.vue
Unescape View File

@ -1671,6 +1671,7 @@ const searchOrder = async () => {
} }
}; };
/** 配载图片 */
const handleShowVehicleImgs = ({ row }) => { const handleShowVehicleImgs = ({ row }) => {
$router.push({ $router.push({
path: '/distribution/artery/VehicleNodeImgs', path: '/distribution/artery/VehicleNodeImgs',

Write Preview
Loading…
Cancel
Save