From f0ed73b8faa5e86ac79dce309c8a28bb1b918554 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 16 四月 2025 16:44:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
screen/src/views/LogisticsEfficiency1.vue | 1994 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 5
screen/src/views/LogisticsEfficiency.vue | 36
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 50 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 5
admin/src/views/business/internalMember.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java | 1
14 files changed, 2,074 insertions(+), 45 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 4e46d32..19165d3 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -182,7 +182,7 @@
label="鎿嶄綔" min-width="280">
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="edit(row)"
- v-permissions="['business:empower:update']">缂栬緫</el-button>
+ v-permissions="['business:member:update']">缂栬緫</el-button>
<el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
<el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete"
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index b64832b..5a96827 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -172,7 +172,7 @@
</div>
</div>
<div class="center_box_two">
- <div class="list">
+ <div class="list" style="z-index: 10000">
<div class="item">
<img src="@/assets/images/LogisticsCenter/car_zaitu@2x.png" alt="">
<span>鍦ㄩ�旓細{{ data7.busyNum }}</span>
@@ -186,10 +186,10 @@
<span>绂荤嚎锛歿{ data7.offlineNum }}</span>
</div>
</div>
- <div class="echart_wrap">
+ <div class="echart_wrap" style="width: 100%;height: 100%">
<div ref="echartMap" class="echart_map" id="echartMap"></div>
</div>
- <div class="warnning_info">
+ <div class="warnning_info" style="z-index: 10000">
<div class="head" @click="isShowCarW = !isShowCarW">
<img src="../assets/images/FireFighting/fire_right.png" alt="">
<span>杞﹁締鎶ヨ</span>
@@ -202,7 +202,7 @@
</div>
</div>
</div>
- <div @click="openCloudAddr" class="monitoring">
+ <div @click="openCloudAddr" class="monitoring" style="z-index: 10000">
<img src="@/assets/images/ic_jiankong@2x.png" class="icon" alt="">
<div>杞﹁締鐩戞帶骞冲彴</div>
<img class="top" src="@/assets/images/SecurityControl/ar_open@2x.png" alt="">
@@ -463,7 +463,6 @@
],
yAxis: [
{
- type: 'value',
name: '涓囨敮',
offset: 0,
type: 'value',
@@ -733,22 +732,26 @@
},
geo: [{
map: 'js',
- roam: false, //鏄惁鍏佽缂╂斁
+ roam: true, //鏄惁鍏佽缂╂斁
zoom: 1.2, //榛樿鏄剧ず绾у埆
scaleLimit: {
min: 0,
- max: 3
+ max: 50
}, //缂╂斁绾у埆
+ label: {
+ show: true, // 濮嬬粓鏄剧ず鏂囧瓧
+ color: '#fff' // 璁剧疆鏂囧瓧棰滆壊
+ },
itemStyle: {
normal: {
- areaColor: 'transparent',
- borderColor: '#3fdaff',
- borderWidth: 2,
- shadowColor: 'rgba(63, 218, 255, 0.5)',
- shadowBlur: 30
+ areaColor: '#1d3b60',
+ borderColor: '#428598',
+ borderWidth: 1,
+ // shadowColor: 'rgba(63, 218, 255, 0.5)',
+ // shadowBlur: 30
},
emphasis: {
- areaColor: '#2B91B7',
+ areaColor: '#5bc7d5',
}
},
tooltip: {
@@ -794,12 +797,13 @@
}
},
- //鍦板浘
+ /* //鍦板浘
{
type: 'map',
mapType: 'js',
geoIndex: -1,
zoom: 1.2, //榛樿鏄剧ず绾у埆
+ // roam: true, // 寮�鍚缉鏀惧拰骞崇Щ
label: {
show: true,
color: '#ffffff',
@@ -824,7 +828,7 @@
}
},
data: data
- },
+ },*/
...serData,
]
}
@@ -1301,7 +1305,9 @@
}
}
}
+ .center_box_three{
+ }
.center_box_two {
flex: 1;
width: 100%;
diff --git a/screen/src/views/LogisticsEfficiency1.vue b/screen/src/views/LogisticsEfficiency1.vue
new file mode 100644
index 0000000..def34db
--- /dev/null
+++ b/screen/src/views/LogisticsEfficiency1.vue
@@ -0,0 +1,1994 @@
+<template>
+ <v-scale-screen width="1920" height="960">
+ <div class="main_app">
+ <img src="@/assets/images/energy_ef/bg@2x.png" class="main_bg" alt="" />
+ <div class="main_header">
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
+ <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-璋冨害鑳芥晥璺熻釜</div>
+ <div class="time_wrap">
+ <span class="date">{{ date }}</span>
+ <span class="week">{{ week }}</span>
+ <span class="time">{{ time }}</span>
+ </div>
+ </div>
+ <div class="main_content">
+ <div class="left_box">
+ <div class="left_box_one">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>绱鍑哄簱閲忕粺璁�</div>
+ </div>
+ <div class="tabs">
+ <div class="tab" :class="{ active: activeTab1 == 0 }" @click="tabClick1(0)">鏈湀</div>
+ <div class="separate"></div>
+ <div class="tab" :class="{ active: activeTab1 == 1 }" @click="tabClick1(1)">鏈勾</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="content_wrap">
+ <div class="content">
+ <div class="num" v-if="data1.monthOutTotal || data1.yearOutTotal">{{ activeTab1 == 0 ?
+ data1.monthOutTotal.toLocaleString() : data1.yearOutTotal.toLocaleString() }}</div>
+ <div class="unit_wrap">
+ <!-- <span style="color: #869CC9;">{{ activeTab1 == 0 ? '鍚屾瘮' : '鐜瘮' }}</span> -->
+ <span style="color: #869CC9;">鐜瘮</span>
+ <template v-if="activeTab1 == 0 && data1.monthLastOutTotal">
+ <img v-if="data1.monthOutTotal > data1.monthLastOutTotal" src="@/assets/images/ic_up.png"
+ class="icon" alt="">
+ <img v-else src="@/assets/images/ic_down.png" class="icon" alt="">
+ </template>
+ <template v-if="activeTab1 == 1 && data1.yearLastOutTotal">
+ <img v-if="data1.yearOutTotal > data1.yearLastOutTotal" src="@/assets/images/ic_up.png" class="icon"
+ alt="">
+ <img v-else src="@/assets/images/ic_down.png" class="icon" alt="">
+ </template>
+
+ <span v-if="activeTab1 == 0 && data1.monthLastOutTotal">{{ Math.abs((((data1.monthOutTotal -
+ data1.monthLastOutTotal) / data1.monthLastOutTotal) * 100).toFixed(1)) }}%</span>
+ <span v-else-if="activeTab1 == 1 && data1.yearLastOutTotal">{{ Math.abs((((data1.yearOutTotal -
+ data1.yearLastOutTotal) / data1.yearLastOutTotal) * 100).toFixed(1)) }}%</span>
+ <span v-else style="margin-left: 10px;">-</span>
+ </div>
+ </div>
+ <div class="train_wrap">
+ <div class="icon_wrap">
+ <img src="@/assets//images/energy_ef/chuku_ic_car@2x.png" alt="">
+ </div>
+ <div class="total">
+ <span>绱鍑哄簱杞︽</span>
+ <span><strong>{{ activeTab1 == 0 ? data1.monthOutTimes : data1.yearOutTimes }}</strong><span
+ class="unit">娆�</span></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="left_box_two">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>杩愯緭浠诲姟鍒嗘瀽</div>
+ </div>
+ <div class="tabs">
+ <div class="tab" :class="{ active: activeTab2 == 0 }" @click="tabClick2(0)">杩�7鏃�</div>
+ <div class="separate"></div>
+ <div class="tab" :class="{ active: activeTab2 == 1 }" @click="tabClick2(1)">鏈湀</div>
+ <div class="separate"></div>
+ <div class="tab" :class="{ active: activeTab2 == 2 }" @click="tabClick2(2)">鏈勾</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="energy_wrap">
+ <div class="energyRef"></div>
+ </div>
+ </div>
+ <div class="left_box_three">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>褰撳墠杩愯緭浠诲姟</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="list_wrap">
+ <div class="list">
+ <div class="header line">
+ <span class="item flag">鏍囪瘑</span>
+ <span class="item order">杩愯緭鍗曞彿</span>
+ <span class="item id_card">杩愯緭杞﹁締</span>
+ <span class="item status">浣滀笟鐘舵��</span>
+ <span class="item addr">鏀惰揣鍗曚綅</span>
+ <span class="item time">浠诲姟寮�濮嬫椂闂�</span>
+ </div>
+ <div class="one-swiper list_temp">
+ <div class="swiper-wrapper">
+ <div @click="taskClick(item)" class="line swiper-slide one-swiper-slide" v-for="item in dataList3">
+ <span class="item flag"><span :class="{ flag_bg: item.type == 1 || item.type == 3 }">{{ item.type
+ == 1
+ || item.type == 3 ? '鍑�' : '鍏�' }}</span></span>
+ <span class="item order">{{ item.billCode || item.contractNum }}</span>
+ <span class="item id_card">{{ item.carCodeFront }}</span>
+ <span class="item status">{{ statusMap[item.status].label }}</span>
+ <span class="item addr">{{ item.repertotyAddress }}</span>
+ <span class="item time">{{ item.confirmTaskDate ? item.confirmTaskDate.slice(5, 16) : '-'
+ }}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="center_box">
+ <div class="center_box_one">
+ <div class="tabs">
+ <div class="tab" :class="{ active: activeTab4 == 0 }" @click="tabClick4(0)">
+ <img v-if="activeTab4 == 0" src="@/assets/images/energy_ef/chuku_task_ac.png" alt="">
+ <img v-else src="@/assets/images/energy_ef/chuku_task.png" alt="">
+ <span>鍑哄簱浠诲姟</span>
+ </div>
+ <div class="tab" :style="{ color: activeTab4 == 1 ? '#387df0' : '#d8e4f8' }" @click="tabClick4(1)">
+ <img v-if="activeTab4 == 1" src="@/assets/images/energy_ef/ruku_task_ac.png" alt="">
+ <img v-if="activeTab4 == 0" src="@/assets/images/energy_ef/ruku_task.png" alt="">
+ <span>鍏ュ簱浠诲姟</span>
+ </div>
+ </div>
+ <div class="static_wrap">
+ <div class="item">
+ <img src="@/assets/images/energy_ef/ic_renwuzongliang@2x.png" alt="">
+ <div class="content">
+ <div class="name">褰撳墠浠诲姟閲�</div>
+ <div class="num"><span>{{ activeTab4 == 0 ? data1.currentOutNum : data1.currentInNum }}</span>涓囨敮</div>
+ </div>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/energy_ef/ic_wanchengrenwu@2x.png" alt="">
+ <div class="content">
+ <div class="name">褰撴棩瀹屾垚浠诲姟鎬婚噺</div>
+ <div class="num">
+ <span v-if="data1.currentOutDoneNum || data1.currentInDoneNum" class="today">{{
+ activeTab4 ==
+ 0 ? data1.currentOutDoneNum :
+ data1.currentInDoneNum
+ }}</span>
+ <span v-else>0</span>
+ 涓囨敮
+ </div>
+ </div>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/energy_ef/ic_bili@2x.png" alt="">
+ <div class="content">
+ <div class="name">宸插畬鎴愭瘮渚�</div>
+ <div class="num">
+ <span v-if="activeTab4 == 0 && data1.currentOutNum" class="finish">{{ ((data1.currentOutDoneNum /
+ data1.currentOutNum) * 100).toFixed(1) }}</span>
+ <span v-if="activeTab4 == 1 && data1.currentInNum" class="finish">{{ ((data1.currentInDoneNum /
+ data1.currentInNum) * 100).toFixed(1) }}</span>
+ %
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="center_box_two">
+ <div class="list">
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_zaitu@2x.png" alt="">
+ <span>鍦ㄩ�旓細{{ data7.busyNum }}</span>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_kongxian@2x.png" alt="">
+ <span>绌洪棽锛歿{ data7.idleNum }}</span>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_lixian@2x.png" alt="">
+ <span>绂荤嚎锛歿{ data7.offlineNum }}</span>
+ </div>
+ </div>
+ <div class="echart_wrap">
+ <div ref="echartMap" class="echart_map" id="echartMap"></div>
+ </div>
+ <div class="warnning_info">
+ <div class="head" @click="isShowCarW = !isShowCarW">
+ <img src="../assets/images/FireFighting/fire_right.png" alt="">
+ <span>杞﹁締鎶ヨ</span>
+ </div>
+ <div v-if="isShowCarW" class="war_list">
+ <div class="line" v-for="item in eventList">
+ <div class="id_card">{{ item.carCode }}</div>
+ <div class="title">{{ item.title }}</div>
+ <div v-if="item.time">{{ item.time.slice(11) }}</div>
+ </div>
+ </div>
+ </div>
+ <div @click="openCloudAddr" class="monitoring">
+ <img src="@/assets/images/ic_jiankong@2x.png" class="icon" alt="">
+ <div>杞﹁締鐩戞帶骞冲彴</div>
+ <img class="top" src="@/assets/images/SecurityControl/ar_open@2x.png" alt="">
+ </div>
+
+ </div>
+ </div>
+ <div class="right_box">
+ <div class="right_box_one">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>鍑哄叆搴撴晥鐜�</div>
+ </div>
+ <div class="tabs">
+ <div class="tab" :class="{ active: activeTab12 == 0 }" @click="tabClick12(0)">浠婃棩</div>
+ <div class="separate"></div>
+ <div class="tab" :class="{ active: activeTab12 == 1 }" @click="tabClick12(1)">鏈湀</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="static_wrap">
+ <div class="item">
+ <img src="@/assets/images/energy_ef/ic_chukuxiaolv@2x.png" alt="">
+ <div class="content">
+ <div class="name">鍑哄簱鏁堢巼</div>
+ <div class="num"><span>{{ activeTab12 == 0 ? data1.todayOutRate || 0 : data1.monthOutRate || 0
+ }}</span>涓囨敮/灏忔椂
+ </div>
+ </div>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/energy_ef/ic_rukuxiaolv@2x.png" alt="">
+ <div class="content">
+ <div class="name">鍏ュ簱鏁堢巼</div>
+ <div class="num"><span class="today">{{ activeTab12 == 0 ? data1.todayInRate || 0 : data1.monthInRate
+ || 0
+ }}</span>涓囨敮/灏忔椂</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="right_box_two">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>浠婃棩鍏ュ簱閲忕粺璁�</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="content">
+ <div class="echart_wrap">
+ <div class="pie_text">
+ <div class="fs30"><strong>{{ data5 }}</strong></div>
+ <div>鍏ュ簱鏁伴噺</div>
+ </div>
+ <div class="echart" id="echart1"></div>
+ </div>
+ <div class="list">
+ <div class="item" v-for="item, i in dataList5">
+ <div class="line">
+ <div :style="{ background: colors[i] }" class="icon"></div>
+ <div class="text">{{ item.name }}</div>
+ </div>
+ <div :style="{ color: colors[i] }" class="num">{{ item.value }}涓囨敮 | {{ item.rate }}%</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="right_box_three">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>搴撳瓨鎯呭喌</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="repertory">
+ <div class="use_ratio">
+ <div class="header">
+ <div>搴撳瓨閲� <span class="num">{{ data6.num }}/{{ data6.totalNum }}</span></div>
+ <div v-if="data6.num && data6.totalNum">鍒╃敤鐜噞{ (data6.useRate * 100).toFixed(0) }}%</div>
+ </div>
+ <Percent v-if="data6.num && data6.totalNum" :rate="((data6.num / data6.totalNum) * 100).toFixed(0)" />
+ </div>
+ <div class="list two-swiper">
+ <div class="swiper-wrapper">
+ <div :class="{ orange: item.num < 200 }" class="item two-swiper-slide swiper-slide"
+ v-for="item in data6.stockList">
+ <div class="la">{{ item.name }}</div>
+ <div class="val">{{ item.num }}涓囨敮</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- -->
+ <div class="modal" v-if="showModal">
+ <div class="title_head">
+ <img src="@/assets/images/energy_ef/chuku_ic_car@2x.png" alt="">
+ <span>{{ activeCar.carCode }}</span>
+ </div>
+ <div class="info">
+ <div class="item">
+ <div class="dian"></div>
+ <div class="la">杩愯緭鍗曞彿锛�</div>
+ <div class="val">{{ activeCar.billCode }}</div>
+ </div>
+ <div class="item">
+ <div class="dian"></div>
+ <div class="la">鍙告満淇℃伅锛�</div>
+ <div class="val">{{ activeCar.name }} {{ activeCar.phone }}</div>
+ </div>
+ <div class="item">
+ <div class="dian"></div>
+ <div class="la">鎬昏繍杈撻噺锛�</div>
+ <div class="val" v-if="activeCar.totalNum">{{ activeCar.totalNum }}涓囨敮</div>
+ </div>
+ </div>
+ <div class="tabs">
+ <div :class="{ active: modalTab == 0 }" @click="modalTabClick(0)" class="tab">浣滀笟淇℃伅</div>
+ <div :class="{ active: modalTab == 1 }" @click="modalTabClick(1)" class="tab">鍚堝悓鍒楄〃</div>
+ </div>
+ <div class="tab1" v-if="modalTab == 0">
+ <template v-for="item, i in activeCar.logList">
+ <div class="item" v-if="i < 4 || showMore">
+ <div class="icon_wrap">
+ <img v-if="i != 0" class="dian" src="@/assets/images/ic_dangqian@2x.png" alt="">
+ <img v-else src="@/assets/images/ic_jindu@2x.png" class="dian_ac" alt="">
+ <div v-if="i != activeCar.logList.length - 1" class="line"></div>
+ </div>
+ <div class="content">
+ <div class="status" :class="{ ac: i == 0 }">{{ statusMapD[item.objType] }}</div>
+ <div class="text">{{ item.content }}</div>
+ <div class="time">{{ item.createDate }}</div>
+ </div>
+ </div>
+ </template>
+ <div class="more_btn" v-if="!showMore && activeCar.logList && activeCar.logList.length > 4"
+ @click="showMore = true">鏌ョ湅鏇村浣滀笟淇℃伅</div>
+ <div class="empty" v-if="!activeCar.contractList || activeCar.logList.contractList == 0">
+ <img src="@/assets/images/default_nodata.png" alt="">
+ </div>
+ </div>
+ <div class="tab2" v-if="modalTab == 1">
+ <div class="list">
+ <div class="item" v-for="item in activeCar.contractList">
+ <div class="head">
+ <div class="code">鍚堝悓鍙凤細<span v-if="item.detailList && item.detailList.length > 0">{{
+ item.detailList[0].contractNum }}</span></div>
+ <div class="addr">鏀惰揣鍦帮細{{ item.address }}</div>
+ </div>
+ <div class="line" v-for="i in item.detailList">
+ <div class="name">鐗╂枡鍚嶇О锛�<span class="val">{{ i.materialName }}</span></div>
+ <div class="num">鏁伴噺锛�<span class="val">{{ i.ioQty }}涓囨敮</span></div>
+ </div>
+ </div>
+ <div class="empty" v-if="!activeCar.contractList || activeCar.logList.contractList == 0">
+ <img src="@/assets/images/default_nodata.png" alt="">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="modal_mask" v-if="showModal" @click="closeModal"></div>
+ </div>
+ </v-scale-screen>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import VScaleScreen from 'v-scale-screen'
+import Percent from '@/components/percent.vue'
+import dayjs from 'dayjs'
+import * as echarts from 'echarts'
+import ahJSON from '@/assets/anhui.json'
+import icKongxian from '@/assets/images/LogisticsCenter/map_car_kongxian@2x.png'
+import icLixian from '@/assets/images/LogisticsCenter/map_car_lixian@2x.png'
+import icZaitu from '@/assets/images/LogisticsCenter/map_car_zaitu@2x.png'
+import {
+ wlcenterData,
+ wljobData,
+ wlplatformJobList,
+ wlstockList,
+ wltotalInList,
+ wltransportMeasure,
+ carsListPost,
+ getCarsJobDetails,
+ getJobDetailsById,
+ carsEventListP
+} from '@/api'
+import 'swiper/css/swiper.min.css'
+import Swiper from 'swiper'
+
+const statusMapD = ['浠诲姟鐢熸垚', '纭浠诲姟', '宸茬鍒�', '鍏ュ洯绛夊緟', '鏈堝彴鍙彿', '浣滀笟涓�', '浣滀笟瀹屾垚', '鏈堝彴杞Щ', '寮傚父鎸傝捣', '涓嬪彂鎺堟潈绂诲洯', '绂诲洯', '宸茶繃鍙�']
+const colors = ['#FEAF01', '#01ABFE', '#51F9E4']
+const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
+const date = ref(dayjs().format('YYYY.MM.DD'))
+const week = ref(weekMap[new Date().getDay()])
+const time = ref(dayjs().format('HH:mm:ss'))
+setInterval(() => {
+ date.value = dayjs().format('YYYY-MM-DD')
+ week.value = weekMap[new Date().getDay()]
+ time.value = dayjs().format('HH:mm:ss')
+
+}, 1000)
+
+
+const initEnergy = () => {
+ var myChart = echarts.init(document.querySelector('.energyRef'))
+ // 缁樺埗鍥捐〃
+ myChart.setOption({
+ legend: {
+ itemGap: 12,
+ // icon: 'circle',
+ right: '12px',
+ top: '10px',
+ data: ['璁″垝浠诲姟閲�', '浠诲姟瀹屾垚閲�', '璁″垝浠诲姟鏁�'],
+ itemWidth: 12,
+ itemHeight: 4,
+ textStyle: {
+ color: '#fff',
+ borderColor: '#fff'
+ },
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ top: '26%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ xAxis: [
+ {
+ nameGap: 5,
+ type: 'category',
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: '#999'
+ },
+ },
+ axisLabel: {
+ color: '#869CC9'
+ },
+ nameTextStyle: {
+ color: '#869CC9' // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
+ },
+ axisTick: {
+ show: false,
+ },
+ data: dataList2.value.map(i => i.planDateStrT),
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value',
+ name: '涓囨敮',
+ offset: 0,
+ type: 'value',
+ axisLine: {
+ show: true,
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ width: 1,
+ color: "rgba(49,105,129,0.4)",
+ type: 'dashed'
+ }
+ },
+ axisLabel: {
+ color: '#869CC9'
+ },
+ nameTextStyle: {
+ color: '#869CC9',
+ padding: [0, 0, 0, 12] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
+ },
+ },
+ {
+ type: 'value',
+ name: '涓�',
+ min: 0,
+ axisLabel: {
+ color: '#869CC9'
+ },
+ nameTextStyle: {
+ color: '#869CC9',
+ padding: [0, 0, 0, -18] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
+ },
+ splitLine: {
+ show: false,
+ lineStyle: {
+ width: 1,
+ color: "rgba(49,105,129,0.4)",
+ type: 'dashed'
+ }
+ },
+ },
+ ],
+ series: [
+ {
+ name: '璁″垝浠诲姟閲�',
+ type: 'bar',
+ barWidth: 10,
+ barGap: '60%',
+ label: {
+ show: false,
+ position: 'top',
+ color: '#fff',
+ },
+ yAxisIndex: 0,
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#5bc7d5'
+ },
+ {
+ offset: 1,
+ color: '#1a3f55'
+ }
+ ], false),
+ lineStyle: {
+ width: 1,
+ type: 'solid'
+ },
+ barBorderRadius: [3, 3, 0, 0],
+ },
+ data: dataList2.value.map(i => i.planTaskNum)
+ },
+ {
+ name: '浠诲姟瀹屾垚閲�',
+ type: 'bar',
+ barWidth: 10,
+ yAxisIndex: 0,
+ label: {
+ show: false,
+ position: 'top',
+ color: '#fff',
+ },
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#edaf3d'
+ },
+ {
+ offset: 1,
+ color: '#323522'
+ }
+ ], false),
+ lineStyle: {
+ width: 1,
+ type: 'solid'
+ },
+ barBorderRadius: [3, 3, 0, 0],
+ },
+ data: dataList2.value.map(i => i.finishTaskNum)
+ },
+ {
+ name: '璁″垝浠诲姟鏁�',
+ type: 'line',
+ smooth: false,
+ showAllSymbol: true,
+ yAxisIndex: 1,
+ symbol: 'none',
+ lineStyle: {
+ color: "#1a43bc"
+ },
+ label: {
+ show: false,
+ position: 'top',
+ color: '#fff',
+ },
+ data: dataList2.value.map(i => i.planTimes)
+ }
+ ]
+ })
+
+ window.addEventListener('resize', function () {//鎵ц
+ myChart.resize()
+ })
+}
+const initEchart1 = () => {
+ const myChart = echarts.init(document.getElementById('echart1'))
+ const option = {
+ series: [
+ {
+ type: 'pie',
+ radius: ['86%', '100%'],
+ label: {
+ show: false,
+ position: 'center'
+ },
+ tooltip: {
+ trigger: 'none'
+ },
+ emphasis: {
+ // 璁剧疆鎮诞鏃舵牱寮忎负绌�
+ scale: false, // 鍏抽棴鏀惧ぇ鏁堟灉
+ itemStyle: {
+ shadowBlur: 0, // 闃村奖妯＄硦搴︿负 0
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0)',
+ },
+ },
+ padAngle: 3,
+ itemStyle: {
+ borderRadius: 10
+ },
+ color: colors,
+ labelLine: {
+ show: false
+ },
+ data: dataList5.value
+ }
+ ]
+ }
+ myChart.setOption(option)
+ window.addEventListener('resize', function () { // 鎵ц
+ myChart.resize()
+ })
+}
+
+const echartMap = ref()
+const initMap = () => {
+ console.log('----')
+
+ var myChart = echarts.init(echartMap.value)
+ echarts.registerMap('js', ahJSON)
+ const scatterData = data7.value.carsList.map(item => {
+ return {
+ name: item.terminalId,
+ img: item.jobStatus == 2 ? icLixian : item.jobStatus == 1 ? icZaitu : icKongxian,
+ data: [{ code: item.plateNum, value: [item.longitude, item.latitude] }]
+ }
+ })
+ // var scatterData = [
+ // {
+ // name: '骞煎効鍥�',
+ // num: 15,
+ // // color: ['#1984ff', '#184b8d'],
+ // img: icKongxian,
+ // data: [
+ // { name: 'asdasdas ', value: [117.25, 31.49] },
+ // ],
+ // },
+ // ]
+ let serData = []
+ scatterData.forEach((item) => {
+ serData.push({
+ name: `${item.name}`,
+ type: 'effectScatter',
+ coordinateSystem: 'geo',
+ effectType: 'ripple',
+ showEffectOn: 'render',
+ // 鏁ｇ偣鏍峰紡
+ rippleEffect: {
+ period: 1,
+ scale: 1,
+ brushType: 'fill'
+ },
+ // 鏁ｇ偣澶у皬 鑷畾涔夋暎鐐瑰浘鐗�
+ // symbol: `image://${item.img}`,
+ symbol: `image://${item.img}`,
+ label: {
+ show: true,
+ formatter: '{b|{b}}',
+ position: 'top',
+ distance: -1,
+ rich: {
+ b: {
+ color: "#fff",
+ fontSize: 14,
+ height: 30,
+ // width: 200,
+ padding: 5,
+ },
+ }
+ },
+ symbolSize: [32, 40],
+ hoverAnimation: true,
+ zlevel: 99,
+ data: item.data,
+ })
+ }
+ )
+ var data = [
+ { name: "鍚堣偉甯�", value: 3 },
+ { name: "婊佸窞甯�", value: 0 },
+ { name: "鑺滄箹甯�", value: 1 },
+ { name: "闃滈槼甯�", value: 0 },
+ { name: "铓屽煚甯�", value: 4 },
+ { name: "娣崡甯�", value: 0 },
+ { name: "椹瀺灞卞競", value: 6 },
+ { name: "瀹夊簡甯�", value: 2 },
+ { name: "榛勫北甯�", value: 0 },
+ { name: "閾滈櫟甯�", value: 40 },
+ { name: "瀹垮窞甯�", value: 0 },
+ { name: "娣寳甯�", value: 0 },
+ { name: "鍏畨甯�", value: 0 },
+ { name: "姹犲窞甯�", value: 1 },
+ { name: "瀹ｅ煄甯�", value: 0 },
+ { name: "浜冲窞甯�", value: 0 },
+ ]
+ const option = {
+ title: {
+ top: 20,
+ text: '',
+ subtext: '',
+ x: 'center',
+ textStyle: {
+ color: '#ffffff'
+ }
+ },
+ visualMap: {
+ show: false,
+ max: 100,
+ seriesIndex: [3],
+ inRange: {
+ color: ['#A5DCF4', '#006edd']
+ }
+ },
+ geo: [{
+ map: 'js',
+ roam: true, //鏄惁鍏佽缂╂斁
+ zoom: 1.2, //榛樿鏄剧ず绾у埆
+ scaleLimit: {
+ min: 0,
+ max: 50
+ }, //缂╂斁绾у埆
+ itemStyle: {
+ normal: {
+ areaColor: '#1d3b60',
+ borderColor: '#428598',
+ borderWidth: 2,
+ // shadowColor: 'rgba(63, 218, 255, 0.5)',
+ shadowBlur: 30
+ },
+ emphasis: {
+ areaColor: '#2B91B7',
+ }
+ },
+ tooltip: {
+ show: false
+ }
+ }],
+ series: [
+ {
+ type: 'effectScatter',
+ coordinateSystem: 'geo',
+ z: 5,
+ data,
+ symbolSize: 14,
+ label: {
+ normal: {
+ show: false,
+ formatter: function (params) {
+ return '{fline|鍦扮偣锛�' + params.data.city + '}\n{tline|' + (params.data.info || '鍙戠敓xx闆嗕欢') + '}'
+ },
+ position: 'top',
+ backgroundColor: 'rgba(233,63,66,.9)',
+ padding: [0, 0],
+ borderRadius: 3,
+ lineHeight: 32,
+ color: '#ffffff',
+ rich: {
+ fline: {
+ padding: [0, 10, 10, 10],
+ color: '#ffffff'
+ },
+ tline: {
+ padding: [10, 10, 0, 10],
+ color: '#ffffff'
+ }
+ }
+ },
+ emphasis: {
+ show: true
+ }
+ },
+ itemStyle: {
+ color: '#e93f42',
+ }
+ },
+
+ //鍦板浘
+ {
+ type: 'map',
+ mapType: 'js',
+ geoIndex: -1,
+ zoom: 1.2, //榛樿鏄剧ず绾у埆
+ // roam: true, // 寮�鍚缉鏀惧拰骞崇Щ
+ label: {
+ show: true,
+ color: '#ffffff',
+
+ },
+ itemStyle: {
+ normal: {
+ borderColor: '#428598',
+ borderWidth: 1,
+ areaColor: '#1d3b60'
+ },
+ emphasis: {
+ disabled: true,
+ // areaColor: '#FA8C16',
+ // borderWidth: 1,
+ // color: '#428598',
+ label: {
+ show: true, // 濮嬬粓鏄剧ず鏂囧瓧
+ color: '#fff' // 璁剧疆鏂囧瓧棰滆壊
+ },
+ areaColor: null
+ }
+ },
+ data: data
+ },
+ ...serData,
+ ]
+ }
+
+ myChart.setOption(option)
+ myChart.on('click', function (params) {
+ const item = params.data
+ getCarsJobDetails({ carCode: item.code }).then(res => {
+ // getCarsJobDetails({ id: item.id }).then(res => {
+ // getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
+ showModal.value = true
+ activeCar.value = { ...res.data, carCode: item.code }
+ })
+ })
+ window.addEventListener('resize', function () {//鎵ц
+ myChart.resize()
+ })
+}
+const activeCar = ref({})
+const showModal = ref(false)
+const modalTab = ref(0)
+const showMore = ref(false)
+const modalTabClick = (val) => {
+ modalTab.value = val
+}
+const closeModal = () => {
+ showModal.value = false
+ activeCar.value = {}
+}
+const taskClick = (item) => {
+ // getCarsJobDetails({ carCode: item.carCodeFront }).then(res => {
+ getJobDetailsById({ id: item.id }).then(res => {
+ // getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
+ showModal.value = true
+ activeCar.value = { ...res.data, carCode: item.carCodeFront }
+ })
+}
+
+const openCloudAddr = () => {
+ window.open('https://vms.hikvisionauto.com:8040/', '_blank')
+}
+
+
+const data1 = ref({})
+const activeTab1 = ref(0)
+const activeTab12 = ref(0)
+const tabClick1 = (val) => {
+ activeTab1.value = val
+}
+const tabClick12 = (val) => {
+ activeTab12.value = val
+}
+const getData1 = () => {
+ wlcenterData().then(res => {
+ const result = res.data
+ data1.value = result
+ })
+}
+
+const dataList2 = ref([])
+const activeTab2 = ref(0)
+const tabClick2 = (val) => {
+ activeTab2.value = val
+ getData2()
+}
+const getData2 = () => {
+ wltransportMeasure({ queryType: activeTab2.value }).then(res => {
+ const result = res.data || []
+ dataList2.value = result
+ dataList2.value.forEach(item => {
+ item.planDateStrT = activeTab2.value == 2 ? dayjs(item.planDate).format('M') : dayjs(item.planDate).format('M.D')
+ })
+ initEnergy()
+ })
+}
+
+const dataList3 = ref([])
+const statusMap = [
+ { value: 0, label: '寰呯‘璁�' },
+ { value: 1, label: '寰呯鍒�' },
+ { value: 2, label: '绛夊緟鍙彿' },
+ { value: 3, label: '鍏ュ洯绛夊緟' },
+ { value: 4, label: '鏈堝彴绛夊緟' },
+ { value: 5, label: '浣滀笟涓�' },
+ { value: 6, label: '浣滀笟瀹屾垚' },
+ { value: 7, label: '杞Щ涓�' },
+ { value: 8, label: '寮傚父鎸傝捣' },
+ { value: 9, label: '宸叉巿鏉冪鍥�' },
+ { value: 10, label: '宸茬鍥�' },
+ { value: 11, label: '宸茶繃鍙�' },
+ { value: 12, label: '宸插彇娑�' },
+]
+const getData3 = () => {
+ wlplatformJobList().then(res => {
+ const result = res.data
+ dataList3.value = result
+ })
+}
+const activeTab4 = ref(0)
+const tabClick4 = (val) => {
+ activeTab4.value = val
+}
+const dataList5 = ref([])
+const data5 = ref(0)
+const getData5 = () => {
+ wltotalInList().then(res => {
+ const result = res.data || []
+ let count = 0
+ dataList5.value = result.map(i => {
+ i.value = i.num
+ count += i.num
+ return i
+ })
+ dataList5.value.forEach(i => {
+ i.rate = count == 0 ? 0 : ((i.num / count) * 100).toFixed(0)
+ })
+ data5.value = count
+ initEchart1()
+ })
+}
+const data6 = ref({})
+const getData6 = () => {
+ wlstockList().then(res => {
+ const result = res.data || []
+ data6.value = result
+ })
+}
+
+const isShowCarW = ref(false)
+const data7 = ref({})
+const eventList = ref([])
+const getData7 = () => {
+ carsListPost().then(res => {
+ const result = res.data || {}
+ data7.value = result
+ initMap()
+ }, () => {
+ data7.value = {
+ carsList: []
+ }
+ initMap()
+ })
+ carsEventListP().then(res => {
+ eventList.value = res.data || []
+ })
+}
+
+const autoplayFlag = (list = [], leng = 4, time = 2000) => {
+ if (list.length > leng) {
+ return { delay: time, disableOnInteraction: false }
+ } else {
+ return false
+ }
+}
+const loopFn1 = () => {
+ var newSwiper1 = new Swiper('.one-swiper', {
+ initialSlide: 0,
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 7,
+ autoplay: autoplayFlag(dataList3.value, 7, 2000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiperiper
+ })
+}
+const loopFn2 = () => {
+ var newSwiper1 = new Swiper('.two-swiper', {
+ initialSlide: 0,
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 6,
+ autoplay: autoplayFlag(data6.value.stockList, 6, 2000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiperiper
+ })
+}
+onMounted(() => {
+ getData1()
+ getData2()
+ getData3()
+ getData5()
+ getData6()
+ getData7()
+
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getData5()
+ getData6()
+ getData7()
+ }, 1000 * 60 * 10)
+
+ setTimeout(() => {
+ loopFn1()
+ loopFn2()
+ }, 12000)
+})
+
+
+</script>
+
+<style lang="scss" scoped>
+div {
+ box-sizing: border-box;
+}
+
+.swiper-wrapper {
+ display: block !important;
+}
+
+.main_content {
+ display: flex;
+ padding: 20px 25px 0;
+
+ .left_box {
+ width: 440px;
+
+ .left_box_one {
+ width: 100%;
+ position: relative;
+ margin-bottom: 20px;
+
+ .content_wrap {
+ height: 164px;
+ padding: 22px 20px 0;
+
+ .content {
+ display: flex;
+ align-items: flex-end;
+ margin: 10px 0 22px;
+
+ .num {
+ margin-right: 10px;
+ font-weight: bold;
+ font-size: 44px;
+ height: 48px;
+ line-height: 50px;
+ font-weight: bold;
+ color: #00F2F3;
+ letter-spacing: 3px;
+ background-image: -webkit-linear-gradient(top,
+ #1cdafb 0%,
+ #0177FE 70%,
+ #0177FE 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+
+ .unit_wrap {
+ display: flex;
+ align-items: center;
+ }
+
+ .icon {
+ width: 10px;
+ height: 12px;
+ margin-right: 6px;
+ margin-left: 4px;
+ }
+ }
+
+ .train_wrap {
+ display: flex;
+ height: 40px;
+ margin-top: 18px;
+
+ .icon_wrap {
+ width: 40px;
+ height: 40px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-right: 4px;
+ border: 1px solid;
+ background: linear-gradient(180deg, rgba(0, 148, 235, 0.68) 0%, rgba(0, 148, 235, 0) 100%);
+ border-image: linear-gradient(180deg, rgba(177, 210, 255, 0.64), rgba(0, 171, 255, 0.7)) 1 1;
+
+ img {
+ width: 26px;
+ }
+ }
+
+ .total {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 20px;
+ font-size: 16px;
+ border: 1px solid;
+ border-image: linear-gradient(180deg, rgba(177, 210, 255, 0.64), rgba(0, 171, 255, 0.7)) 1 1;
+ background: linear-gradient(180deg, rgba(0, 148, 235, 0.68) 0%, rgba(0, 148, 235, 0) 100%);
+
+ .unit {
+ margin-left: 5px;
+ font-size: 13px;
+ }
+ }
+ }
+ }
+ }
+
+ .left_box_two {
+ margin-bottom: 20px;
+
+ .energy_wrap {
+ width: 100%;
+ height: 250px;
+
+ .energyRef {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ }
+
+ .left_box_three {
+ .list_wrap {
+ padding: 10px 0;
+
+ .list_temp {
+ height: 210px !important;
+ overflow: hidden;
+ }
+
+ .list {
+ .line {
+ display: flex;
+ height: 30px !important;
+ align-items: center;
+ padding: 0 10px;
+ font-size: 12px;
+ cursor: pointer;
+
+ &:nth-of-type(2n) {
+ background: rgba(27, 64, 97, 0.52);
+ }
+
+ .item {
+ flex: 5;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .flag {
+ flex: 3;
+ display: flex;
+
+ span {
+ width: 22px;
+ height: 22px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50%;
+ background: #00F2F3;
+ font-weight: 500;
+ color: #001B3C;
+ }
+
+ .flag_bg {
+ background: #4eacf6;
+ }
+ }
+
+ .status {
+ color: #FEAF01;
+ }
+
+ .addr {
+ flex: 8;
+
+ }
+
+ .time {
+ flex: 6;
+ margin-left: 6px;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .center_box {
+ flex: 1;
+ padding: 16px 60px;
+ display: flex;
+ flex-direction: column;
+
+ .center_box_one {
+ height: 190px;
+
+ .tabs {
+ display: flex;
+ align-items: center;
+
+ .tab {
+ display: flex;
+ align-items: center;
+ margin-right: 30px;
+ cursor: pointer;
+
+ img {
+ width: 20px;
+ height: 20px;
+ margin-right: 8px;
+ }
+
+ font-size: 20px;
+ font-weight: 600;
+ color: #D2E0FF;
+ }
+
+ .active {
+ background-image: -webkit-linear-gradient(top,
+ #fff 0%,
+ #eec05f 60%,
+ #eec05f 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+ }
+
+ .static_wrap {
+ display: flex;
+ align-items: center;
+ margin: 30px 0 54px;
+
+ .item {
+ display: flex;
+ justify-content: center;
+ flex: 1;
+
+ img {
+ width: 68px;
+ height: 71px;
+ margin-right: 15px;
+ }
+
+ .content {
+ font-size: 15px;
+
+ .num {
+ font-size: 12px;
+ color: #D2E0FF;
+
+ span {
+ font-weight: bold;
+ font-size: 30px;
+ margin-right: 5px;
+ font-weight: 600;
+ background-image: -webkit-linear-gradient(top,
+ #01D9FE 0%,
+ #01D9FE 60%,
+ #fff 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+
+ .today {
+ background-image: -webkit-linear-gradient(top,
+ #fff 0%,
+ #20FFC5 50%,
+ #20FFC5 100%);
+ }
+
+ .finish {
+ background-image: -webkit-linear-gradient(top,
+ #fff 0%,
+ #FFB120 50%,
+ #FFB120 100%);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .center_box_two {
+ flex: 1;
+ width: 100%;
+ position: relative;
+
+ .list {
+ position: absolute;
+ top: 10px;
+ left: 20px;
+
+ .item {
+ display: flex;
+ align-items: center;
+ font-weight: 500;
+ font-size: 20px;
+ margin-bottom: 18px;
+
+ img {
+ width: 36px;
+ height: 36px;
+ margin-right: 15px;
+ }
+ }
+ }
+
+ .echart_wrap {
+ width: 86%;
+ height: 100%;
+
+ .echart_map {
+ width: 100%;
+ height: 100%;
+ /* transform: rotate(60deg); */
+ }
+ }
+
+ .warnning_info {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ border-top: 1px solid #5ecbce;
+ border-bottom: 1px solid #5ecbce;
+ background: rgba(0, 30, 63, 0.4);
+ /* backdrop-filter: blur(5px); */
+
+ .head {
+ display: flex;
+ width: 280px;
+ height: 57px;
+ display: flex;
+ align-items: center;
+ padding-left: 10px;
+ font-weight: bold;
+ font-size: 16px;
+ cursor: pointer;
+
+ img {
+ width: 14px;
+ margin-right: 10px;
+ }
+ }
+
+ .war_list {
+ max-height: 300px;
+ overflow: auto;
+ padding-left: 10px;
+ padding-bottom: 12px;
+
+ .line {
+ font-size: 13px;
+ color: #D2E0FF;
+ display: flex;
+ align-items: center;
+ height: 30px;
+
+ div {
+ flex: 3;
+ }
+
+ .id_card {
+ color: #00F2F3;
+ }
+
+ .title {
+ flex: 4;
+ }
+ }
+ }
+ }
+
+ .monitoring {
+ position: absolute;
+ cursor: pointer;
+ bottom: 10px;
+ left: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-weight: 500;
+ font-size: 15px;
+ width: 156px;
+ height: 40px;
+ background: linear-gradient(180deg, rgba(0, 148, 235, 0.68) 0%, rgba(0, 148, 235, 0) 100%);
+ border-radius: 2px;
+ border: 1px solid;
+ border-image: linear-gradient(180deg, rgba(177, 210, 255, 0.64), rgba(0, 171, 255, 0.7)) 1 1;
+
+ .icon {
+ width: 16px;
+ height: 16px;
+ margin-right: 10px;
+ }
+
+ .top {
+ width: 7px;
+ margin-left: 6px;
+ }
+ }
+ }
+ }
+
+ .right_box {
+ width: 440px;
+
+ .right_box_one {
+ margin-bottom: 20px;
+
+ .static_wrap {
+ display: flex;
+ justify-content: space-evenly;
+ align-items: center;
+ height: 140px;
+
+ .item {
+ display: flex;
+ align-items: center;
+
+ img {
+ width: 80px;
+ height: 80px;
+ margin-right: 5px;
+ }
+
+ .content {
+ font-size: 14px;
+
+ .num {
+ font-size: 12px;
+ color: #D2E0FF;
+ margin-top: 8px;
+
+ span {
+ font-weight: bold;
+ font-size: 24px;
+ margin-right: 4px;
+ font-weight: 600;
+ background-image: -webkit-linear-gradient(top,
+ #01D9FE 0%,
+ #01D9FE 60%,
+ #fff 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+
+ .today {
+ background-image: -webkit-linear-gradient(top,
+ #fff 0%,
+ #20FFC5 50%,
+ #20FFC5 100%);
+ }
+
+ .finish {
+ background-image: -webkit-linear-gradient(top,
+ #fff 0%,
+ #FFB120 50%,
+ #FFB120 100%);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .right_box_two {
+ .content {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 200px;
+
+ .echart_wrap {
+ position: relative;
+
+ .pie_text {
+ width: 104px;
+ height: 104px;
+ border: 1px dashed;
+ border-radius: 50%;
+ position: absolute;
+
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 999;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ font-size: 14px;
+
+ .fs30 {
+ font-size: 30px;
+ }
+ }
+ }
+
+ .echart {
+ width: 140px;
+ height: 140px;
+ }
+
+ .list {
+ margin-left: 36px;
+
+ .item {
+ margin-bottom: 14px;
+ font-size: 14px;
+
+ &:nth-last-child(1) {
+ margin: 0;
+ }
+
+ .line {
+ display: flex;
+ align-items: center;
+ margin-bottom: 6px;
+
+ .icon {
+ width: 12px;
+ height: 12px;
+ border-radius: 50%;
+ margin-right: 10px;
+ background: linear-gradient(270deg, #29aeff 0%, #207ff7 100%);
+ }
+ }
+
+ .num {
+ margin-left: 20px;
+ }
+ }
+ }
+ }
+ }
+
+ .right_box_three {
+ .repertory {
+ .header {
+ padding: 15px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 14px;
+ color: #D2E0FF;
+ margin-bottom: 11px;
+
+ .num {
+ font-weight: 500;
+ font-size: 16px;
+ color: #FFFFFF;
+ }
+ }
+
+ .list {
+ margin-top: 22px;
+ height: 216px;
+ overflow: hidden;
+ scrollbar-width: none;
+
+ .item {
+ width: 100%;
+ height: 36px !important;
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+
+ &:nth-of-type(2n+1) {
+ background: rgba(0, 152, 255, 0.13);
+ }
+
+ .la {
+ flex: 5;
+ padding-left: 20px;
+ }
+
+ .val {
+ flex: 2;
+ }
+ }
+
+ .orange {
+ color: #FF5728;
+ }
+ }
+ }
+ }
+ }
+}
+
+.main_header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 90px;
+ position: relative;
+ padding: 0px 40px 16px;
+ font-weight: 600;
+ font-size: 36px;
+
+ .title {
+ background-image: -webkit-linear-gradient(top,
+ #ffffff 0%,
+ #c8ddff 70%,
+ #85b4ff 80%,
+ #74a9ff 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+
+ .time_wrap {
+ font-size: 26px;
+ font-weight: 600;
+ background-image: -webkit-linear-gradient(top,
+ #ffffff 0%,
+ #c8ddff 50%,
+ #85b4ff 80%,
+ #74a9ff 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ display: flex;
+ align-items: center;
+
+ .time {
+ width: 130px;
+ display: flex;
+ justify-content: flex-end;
+ font-size: 30px;
+ }
+
+ .week {
+ margin-left: 20px;
+ }
+ }
+
+ .main_header_bg {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ z-index: -1;
+ }
+}
+
+.com_header {
+ height: 40px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 15px 0 13px;
+ position: relative;
+
+ .title {
+ display: flex;
+ align-items: center;
+ font-weight: bold;
+ font-size: 16px;
+ background-image: -webkit-linear-gradient(top,
+ #ffffff 0%,
+ #c8ddff 66%,
+ #85b4ff 72%,
+ #74a9ff 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+
+ .icon {
+ width: 16px;
+ height: 16px;
+ margin-right: 14px;
+ }
+ }
+
+ .tabs {
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ color: #d2e0ff;
+
+ .separate {
+ width: 1px;
+ height: 14px;
+ background-color: #d2e0ff;
+ margin: 0 6px;
+ }
+
+ .tab {
+ cursor: pointer;
+ }
+
+ .active {
+ color: #0094eb;
+ }
+ }
+}
+
+.main_app {
+ width: 1920px;
+ height: 960px;
+ /* width: 100%;
+ height: 100vh; */
+ background: #0b2539;
+ color: #FFFFFF;
+ position: relative;
+ z-index: -2;
+ font-size: 14px;
+
+ .main_bg {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ z-index: -1;
+ }
+}
+
+.modal {
+ width: 600px;
+ height: 556px;
+ background: rgba(0, 30, 63, 0.5);
+ backdrop-filter: blur(5px);
+ position: fixed;
+ top: 20%;
+ left: 50%;
+ transform: translate(-50%, 0);
+ z-index: 999;
+ padding: 24px;
+
+ .title_head {
+ display: flex;
+ align-items: center;
+ font-weight: bold;
+ font-size: 17px;
+ margin-bottom: 20px;
+
+ img {
+ width: 20px;
+ margin-right: 4px;
+ }
+ }
+
+ .info {
+ display: flex;
+ flex-wrap: wrap;
+
+ .item {
+ display: flex;
+ align-items: center;
+ font-size: 13px;
+ width: 55%;
+ margin-bottom: 8px;
+
+ &:nth-of-type(2n+1) {
+ width: 45%;
+ }
+
+ .dian {
+ width: 4px;
+ height: 4px;
+ background-color: #fff;
+ border-radius: 50%;
+ margin-right: 4px;
+ }
+
+ .la {
+ color: #01D9FE;
+ }
+ }
+ }
+
+ .tabs {
+ display: flex;
+ border-bottom: 1px solid rgba(255, 255, 255, 0.16);
+ margin: 0 -24px;
+ margin-bottom: 20px;
+ padding-left: 12px;
+
+ .tab {
+ color: #869CC9;
+ font-size: 14px;
+ margin-right: 12px;
+ width: 80px;
+ height: 42px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-bottom: 2px solid #06182e;
+ cursor: pointer;
+ }
+
+ .active {
+ font-weight: 500;
+ font-size: 15px;
+ color: #00F2F3;
+ border-bottom: 2px solid #00F2F3;
+ }
+ }
+
+ .tab1 {
+ height: 360px;
+ overflow: auto;
+
+ .more_btn {
+ width: 116px;
+ height: 25px;
+ border-radius: 2px;
+ border: 1px solid #D2E0FF;
+ font-size: 12px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: D2E0FF;
+ margin-left: 30px;
+ margin-top: 12px;
+ cursor: pointer;
+ }
+
+
+ .item {
+ display: flex;
+
+ &:nth-last-child(1) {
+ .content {
+ .time {
+ padding-bottom: 0;
+ }
+ }
+ }
+
+ .icon_wrap {
+ width: 24px;
+ margin-right: 10px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .dian {
+ width: 12px;
+ height: 12px;
+ }
+
+ .dian_ac {
+ width: 24px;
+ height: 24px;
+ }
+
+ .line {
+ width: 1px;
+ height: 100%;
+ border: 1px dashed #8a9bc5;
+ }
+ }
+
+ .content {
+ font-size: 13px;
+ color: #D2E0FF;
+
+ .status {
+ font-weight: 500;
+ font-size: 14px;
+ margin-bottom: 5px;
+ color: #fff;
+ }
+
+ .ac {
+ color: #00F2F3;
+ }
+
+ .text {
+ margin-bottom: 4px;
+ }
+
+ .time {
+ font-size: 12px;
+ padding-bottom: 12px;
+ }
+ }
+ }
+ }
+
+ .tab2 {
+ height: 360px;
+ overflow: auto;
+
+ .list {
+ .item {
+ width: 560px;
+ background: rgba(1, 171, 254, 0.1);
+ font-size: 12px;
+ color: #D2E0FF;
+ padding: 10px;
+ margin-bottom: 10px;
+
+ .head {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 36px;
+ line-height: 36px;
+ border-bottom: 1px solid rgba(255, 255, 255, 0.16);
+ margin-bottom: 10px;
+ padding-right: 10px;
+
+ .code {
+ font-weight: 500;
+ font-size: 14px;
+ color: #00F2F3;
+ }
+ }
+
+ .line {
+ display: flex;
+ align-items: center;
+ margin-bottom: 8px;
+
+ &:nth-last-child(1) {
+ margin-bottom: 0;
+ }
+
+ .name {
+ flex: 4;
+ }
+
+ .num {
+ flex: 3;
+ }
+
+ .val {
+ color: #fff;
+ }
+ }
+ }
+ }
+ }
+
+ .empty {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 340px;
+
+ img {
+ width: 144px;
+ }
+ }
+}
+
+.modal_mask {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ z-index: 99;
+ background-color: rgba(0, 0, 0, 0.1);
+ /* background-color: red; */
+}
+
+.bg {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ z-index: -1;
+}
+</style>
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
index 329c600..9c60826 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -253,7 +253,6 @@
@ApiModelProperty(value = "鏈夋晥鏈熺被鍨� 0闀挎湡鏈夋晥 1鑷畾涔�",hidden = true )
@TableField(exist = false)
private Integer timeType;
- //鏆傛棤浣跨敤
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
@TableField(exist = false)
private String keyword;
@@ -281,19 +280,15 @@
@ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
@TableField(exist = false)
private Integer headStatus;
-
-
@ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
@TableField(exist = false)
private String roleName;
@ApiModelProperty(value = "鏈�鍚庢搷浣滃唴瀹�")
@TableField(exist = false)
private String optRemark;
-
@ApiModelProperty(value = "system openid" , hidden = true)
@TableField(exist = false)
private String systemOpenid;
-
@ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
@TableField(exist = false)
private Date trainStartTime;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 5ed30ea..6d540f1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -490,13 +490,14 @@
* 3銆佽兘绠′腑蹇冿細ngzx
*/
public interface MenuPageId{
- String[] componentIds = new String[]{"Infovision iPark Platform","dfe"};
+ String[] componentIds = new String[]{"Infovision iPark Platform","dfe","cems"};
String afzx = "afzx";//瀹夐槻涓績
String xkzx = "xkzx";//娑堟帶涓績
String ngzx = "ngzx";//鑳界涓績
String jsc = "jsc";//鐗╀笟鍚庡嫟
String kqgzt = "attendance_workstand";//鑰冨嫟绠＄悊
String kqdbcl = "process_apply";//鑰冨嫟浠ｅ姙澶勭悊
+ String xfzx = "010200"; //娑堣垂涓績
}
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 211ee60..5722e30 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1200,9 +1200,14 @@
}else if(Constants.equalsInteger(type,Constants.FIVE)){
componentId = HKConstants.MenuPageId.componentIds[1];
menuId = HKConstants.MenuPageId.kqdbcl;
+ }else if(Constants.equalsInteger(type,Constants.SIX)){
+ //https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&componentId=cems&componentMenuId=010200
+ componentId = HKConstants.MenuPageId.componentIds[2];
+ menuId = HKConstants.MenuPageId.xfzx;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
+ ///xauthplus-plugin/thirdLogin?type=third&componentId=${componentId}&componentMenuId=${menuId}&token=${token}
String res = HKTools.getMenuUrl(componentId,menuId,token);
return res;
}catch (Exception e){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
index 922d579..96f1327 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -139,4 +141,8 @@
@TableField(exist = false)
private String contractNum;
+ @ApiModelProperty(value = "鎬昏繍杈撻噺", example = "1")
+ @TableField(exist = false)
+ private BigDecimal totalNum;
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java
index b867f8b..3410be1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java
@@ -71,11 +71,9 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿",index = 12, dateFormat = "yyyy-MM-dd hh:mm:ss",width = 10)
private Date createDate;
-
@ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�" , example = "1")
@ExcelColumn(name="鐘舵��",index =13,width = 6, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
private Integer status;
-
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О")
@ExcelColumn(name="浣滀笟鏈堝彴鍚嶇О",index =14,width = 8)
private String platformName ;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 81babf3..2d2015e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -97,7 +97,7 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
}
if(Objects.nonNull(parent.getType())&&!Constants.equalsInteger(parent.getType(),-1)){
- if(Constants.equalsInteger(company.getType(),parent.getType())){
+ if(!Constants.equalsInteger(company.getType(),parent.getType())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝缁勭粐淇℃伅閿欒");
}
}else if(Objects.isNull(parent.getType())){
@@ -334,7 +334,6 @@
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
}
}
-
}
@Override
@@ -698,7 +697,7 @@
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
// queryWrapper.eq(type!=null,Company::getType,type);
- queryWrapper.apply("( type = "+type+" or type = -1 )");
+ queryWrapper.apply("( t.type = "+type+" or t.type = -1 )");
}else if(Objects.nonNull(type) && Constants.equalsInteger(type,Constants.TWO)){
String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
if(StringUtils.isNotBlank(companySpecialId)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index cf85644..17ca901 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -579,7 +579,6 @@
trainTimeMapper.insert(trainTime);*/
return insert.getId();
}
-
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
@@ -628,8 +627,6 @@
}
}
}
-
-
@Override
public void roleAuthById(Integer id,LoginUserInfo user) {
Member member = memberMapper.selectById(id);
@@ -698,7 +695,6 @@
memberRole.setStartTime(trainTime.getStartTime());
memberRole.setEndTime(trainTime.getEndTime());
}
-
memberMapper.update(null,new UpdateWrapper<Member>().lambda()
.eq(Member::getId,member.getId())
.set(Member::getRoleId,member.getRoleId())
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 9f60d1e..911fd4f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -2440,7 +2440,9 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jobIdList)){
List<PlatformJob> platformJobList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda()
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
+ ,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
+ ,Constants.PlatformJobStatus.WAIT_CALL.getKey())
.in(PlatformJob::getId,jobIdList)
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
@@ -2451,7 +2453,6 @@
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getId,platformJobList.stream().map(i->i.getId()).collect(Collectors.toList())));
-
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
index a50c14e..3fae3cf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
@@ -109,6 +109,7 @@
.selectAs(PlatformJob::getCarCodeBack,PlatformLog::getCarCodeBack)
.selectAs(PlatformJob::getBillCode,PlatformLog::getBillCode)
.selectAs(PlatformJob::getContractNum,PlatformLog::getContractNum)
+ .selectAs(PlatformJob::getTotalNum,PlatformLog::getTotalNum)
.leftJoin(PlatformJob.class,PlatformJob::getId,PlatformLog::getJobId)
.leftJoin(Platform.class,Platform::getId,PlatformLog::getRemark)
.leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index b88c838..ec27f56 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -31,6 +31,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.net.ftp.FTP;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index aeb499d..7ddc86e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -190,7 +190,8 @@
List<WmsInventoryJsonResponse> t= response.getData().get(0).getJson();
if(t!=null &&t.size()>0){
for(WmsInventoryJsonResponse j :t){
- num = num.add (Constants.formatBigdecimal( j.getQty()));
+ //2025骞�4鏈�9鏃�16:46:40 澶勭悊 鍖呭惈鎵樼洏瀛楃溂鐨勬暟鎹� 涓嶈繘琛屽悎璁�
+ num = num.add (j.getItemName().indexOf("鎵樼洏")<Constants.ZERO?Constants.formatBigdecimal( j.getQty()):BigDecimal.ZERO);
GeneralVO d = new GeneralVO();
d.setNum(Constants.formatBigdecimal(j.getQty()));
d.setName(j.getItemName());
@@ -752,6 +753,20 @@
.apply(queryType==0,"to_days(create_date) >= to_days(now()) -7")
.apply(queryType==1,"year(create_date) = year(now()) and month(create_date) = month(now())")
.apply(queryType==2,"year(create_date) = year(now())"));
+
+
+ List<PlatformJob> finishDataList = platformJobMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getCreateDate,PlatformJob::getCreateDate)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
+ .apply(queryType==0,"to_days(done_date) >= to_days(now()) -7")
+ .apply(queryType==1,"year(done_date) = year(now()) and month(done_date) = month(now())")
+ .apply(queryType==2,"year(done_date) = year(now())"));
+
for (Date date : dayList) {
TransportMeasureVO data = new TransportMeasureVO();
data.setPlanDate(date);
@@ -763,23 +778,34 @@
if(DateUtil.formatDate(date,"yyyy-MM").equals(DateUtil.formatDate(job.getCreateDate(),"yyyy-MM"))){
data.setPlanTimes( data.getPlanTimes() +1);
data.setPlanTaskNum( data.getPlanTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
- if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
- ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())
- ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
- //瀹屾垚鏁�
- data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
- }
+// if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
+// ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())
+// ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
+// //瀹屾垚鏁�
+// data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
+// }
}
}else{
if(DateUtil.formatDate(date,"yyyy-MM-dd").equals(DateUtil.formatDate(job.getCreateDate(),"yyyy-MM-dd"))){
data.setPlanTimes( data.getPlanTimes() +1);
data.setPlanTaskNum( data.getPlanTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
- if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
- ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())
- ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
- //瀹屾垚鏁�
+// if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
+// ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())
+// ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
+// //瀹屾垚鏁�
+// data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
+// }
+ }
+ }
+ }
+ for (PlatformJob job :finishDataList) {
+ if(queryType == 2){
+ if(DateUtil.formatDate(date,"yyyy-MM").equals(DateUtil.formatDate(job.getDoneDate(),"yyyy-MM"))){
data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
- }
+ }
+ }else{
+ if(DateUtil.formatDate(date,"yyyy-MM-dd").equals(DateUtil.formatDate(job.getDoneDate(),"yyyy-MM-dd"))){
+ data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
}
}
}
--
Gitblit v1.9.3