From 9f4d96b920b842ecf7b4149b7c85b980dcbb3613 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 三月 2025 10:40:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java | 4
pda/pages/index/queueup.vue | 13 ++
admin/src/views/platform/queueUp.vue | 11 +
h5/utils/config.js | 4
admin/src/views/business/dangerStatic.vue | 206 +++++++++++++++++++++++++++++++++++++----
h5/pages/login/login.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 4
admin/src/api/business/hiddenDanger.js | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 2
pda/App.vue | 2
12 files changed, 219 insertions(+), 37 deletions(-)
diff --git a/admin/src/api/business/hiddenDanger.js b/admin/src/api/business/hiddenDanger.js
index 37d6dab..d6fbc96 100644
--- a/admin/src/api/business/hiddenDanger.js
+++ b/admin/src/api/business/hiddenDanger.js
@@ -45,3 +45,7 @@
}
})
}
+// 淇敼
+export function hiddenDangerDataPost (data) {
+ return request.post('/visitsAdmin/cloudService/business/hiddenDanger/hiddenDangerData', data)
+}
\ No newline at end of file
diff --git a/admin/src/views/business/dangerStatic.vue b/admin/src/views/business/dangerStatic.vue
index 4d5d385..39c4e08 100644
--- a/admin/src/views/business/dangerStatic.vue
+++ b/admin/src/views/business/dangerStatic.vue
@@ -3,7 +3,7 @@
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getData(1)" @clear="clear"
@changeForm='changeForm'>
<template #fastdate>
- <el-radio-group v-model="filters.fastdate" size="small" @input="changeForm">
+ <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
<el-radio-button label="6">杩�7澶�</el-radio-button>
<el-radio-button label="29">杩�30澶�</el-radio-button>
@@ -13,11 +13,11 @@
<div class="main_content">
<div class="type_wrap">
<div class="title">闅愭偅绫诲瀷缁熻</div>
- <div class="type" ref="typeRef"></div>
+ <div class="echart1" ref="typeRef"></div>
</div>
<div class="dept_wrap">
<div class="title">闅愭偅褰掑睘閮ㄩ棬缁熻</div>
- <div class="dept" ref="deptRef"></div>
+ <div class="echart2" ref="deptRef"></div>
</div>
</div>
</div>
@@ -25,14 +25,20 @@
<script>
import QueryForm from '@/components/common/QueryForm'
-import echarts from 'echarts'
+import * as echarts from 'echarts'
+import { hiddenDangerDataPost } from '@/api/business/hiddenDanger'
+import dayjs from 'dayjs'
export default {
components: {
QueryForm,
},
data() {
return {
- filters: {},
+ filters: {
+ fastdate: '0',
+ queryStartTime: '',
+ queryEndTime: ''
+ },
queryFormConfig: {
formItems: [
{
@@ -40,16 +46,14 @@
type: 'select',
label: '鐘舵��',
options: [
- { label: '璁垮鐢宠', value: '0' },
- { label: '璁垮鎶ュ', value: '1' },
- { label: '鐢ㄨ溅鐢宠', value: '2' },
- { label: '闅愭偅闅忔墜鎷�', value: '3' },
- { label: '鐗╂祦杞︾敵璇�', value: '6' }
+ { label: '寰呭鐞�', value: '0' },
+ { label: '宸插鐞�', value: '1' },
+ { label: '涓嶅鐞�', value: '2' },
]
},
{
- filed1: 'startDate',
- filed2: 'endDate',
+ filed1: 'queryStartTime',
+ filed2: 'queryEndTime',
type: 'datetime',
label: '鎻愭姤鏃堕棿'
},
@@ -61,17 +65,167 @@
],
online: true
},
+ typeList: [],
+ deptList: [],
}
},
+ mounted() {
+ this.changeRadio('0')
+ },
methods: {
- getData(page) {
- console.log(this.filters)
+ changeRadio(day) {
+ const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
+ this.filters.queryStartTime = arr[0]
+ this.filters.queryEndTime = arr[1]
+ this.getData()
},
- changeForm(form) {
- console.log(form)
+ getData(page) {
+ hiddenDangerDataPost({ ...this.filters }).then(res => {
+ if (res) {
+ this.typeList = res.cateList || []
+ this.deptList = res.departmentList || []
+ this.initType()
+ this.initDept()
+ }
+ })
+
+ },
+ changeForm(e) {
+ this.getData()
+ },
+ initType() {
+ const myChart = echarts.init(document.querySelector('.echart1'))
+ let total = 0
+ this.typeList.forEach(i => {
+ total += i.total
+ })
+ let colors = ['#d75a44', '#e39f4d', '#7ac7f6', '#7ac7f6', '#4469ee', '#698af0', '#9fb5f4', '#b6c7f7', '#c8d5f8']
+ let option = {
+ title: [
+ {
+ text: '闅愭偅鎬绘暟',
+ top: '46%',
+ left: '46%',
+ textStyle: {
+ color: '#666666',
+ fontSize: 16,
+ },
+ }, {
+ text: total,
+ top: '50%',
+ left: '48%',
+ textStyle: {
+ color: '#080404',
+ fontSize: 24,
+ fontWeight: 'bold',
+ },
+ }],
+ legend: {
+ left: 'center',
+ bottom: '8%',
+ itemGap: 30,
+ itemWidth: 30,
+ icon: 'circle',
+ formatter: (name) => {
+ const item = this.typeList.filter((item) => item.name === name)[0]
+
+ if (item) {
+ return ` ${name} ${item.total} | ${item.rata}%`
+ } else {
+ return ` ${name} 0 | 0%`
+ }
+ }
+ },
+ series: [
+ {
+ name: 'Access From',
+ type: 'pie',
+ radius: ['28%', '46%'],
+ label: {
+ formatter: "{a|{b}}\n\n{c} | {d}%",
+ rich: {
+ a: {
+ color: '#333333',
+ fontSize: 14,
+ fontWeight: 500
+ }
+ }
+ },
+ labelLine: {
+ showAbove: true,
+ show: true,
+ length: 24,
+ length2: 64,
+ lineStyle: {
+ width: 2 // 绾挎潯瀹藉害
+ }
+ },
+ data: this.typeList.map((i, index) => {
+ return {
+ value: i.total,
+ name: i.name,
+ itemStyle: {
+ color: colors[index]
+ }
+ }
+ })
+ }
+ ]
+ }
+ myChart.setOption(option)
+ window.addEventListener('resize', function () { // 鎵ц
+ myChart.resize()
+ })
+ },
+ initDept() {
+ const myChart = echarts.init(document.querySelector('.echart2'))
+
+ let option = {
+ xAxis: {
+ type: 'category',
+ data: this.deptList.map(i => i.name),
+ axisLabel: {
+ color: '#333333',
+ fontSize: 14,
+ fontWeight: 'bold'
+ }
+ },
+ yAxis: {
+ type: 'value',
+ name: '闅愭偅鏁�',
+ axisLine: {
+ show: true,
+ },
+ },
+ series: [
+ {
+ data: this.deptList.map(i => i.total),
+ type: 'bar',
+ barWidth: 40,
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#d75e45' }, // 娓愬彉璧峰鑹�
+ { offset: 1, color: '#db924c' } // 娓愬彉缁堟鑹�
+ ])
+ },
+
+ label: {
+ show: true, // 鏄剧ず鏍囩
+ position: 'top', // 璁╂爣绛炬樉绀哄湪鏌卞瓙椤堕儴
+ color: '#666666', // 鏂囧瓧棰滆壊
+ fontSize: 14, // 鏂囧瓧澶у皬
+ }
+ }
+ ]
+ }
+ myChart.setOption(option)
+ window.addEventListener('resize', function () { // 鎵ц
+ myChart.resize()
+ })
},
clear() {
this.filters = {}
+ this.getData()
}
}
}
@@ -84,7 +238,8 @@
.main_content {
display: flex;
- height: calc(100% - 110px);
+ height: calc(100% - 100px);
+
.title {
font-weight: 600;
font-size: 16px;
@@ -96,17 +251,26 @@
.type_wrap {
flex: 5;
flex-shrink: 0;
- border: 1px solid #E5E5E5;
- height: 100%;
+ height: calc(100% - 20px);
border-right: 12px solid #f7f7f7;
+
+
+ .echart1 {
+ width: 100%;
+ height: calc(100% - 60px);
+ }
}
.dept_wrap {
flex: 4;
flex-shrink: 0;
- border: 1px solid #E5E5E5;
- height: 100%;
+ height: calc(100% - 20px);
padding-left: 20px;
+
+ .echart2 {
+ width: 100%;
+ height: calc(100% - 60px);
+ }
}
}
</style>
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index df68b06..3ddafb0 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -21,7 +21,7 @@
<span></span>
</div>
</div>
- <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
<el-table-column type="index" label="搴忓彿" width="80" />
<el-table-column label="杞︾墝鍙�" width="130">
<template slot-scope="{ row }">
@@ -55,6 +55,13 @@
</template>
</el-table-column>
<el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
+ <el-table-column label="鐘舵��" align="center" width="80">
+ <template slot-scope="{ row }">
+ <span v-if="row.status == 2" class="red">鏈堝彴绛夊緟</span>
+ <span v-if="row.status == 3" class="primaryColor">鍏ュ洯绛夊緟</span>
+ <span v-if="row.status == 7" class="primaryColor">杞Щ涓�</span>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
<template slot-scope="{ row }">
<el-button v-if="row.billCode" type="text" @click="handleDetail(row)"
@@ -105,7 +112,6 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import BasePage from '@/components/base/BasePage'
import {
getPlatformGroupList,
platformLineUpPage,
@@ -116,7 +122,6 @@
import DriverDetail from "@/views/task/driverDetail.vue"
import PlatformSign from './components/PlatformSign.vue'
export default {
- extends: BasePage,
components: {
Pagination,
QueryForm,
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index a5c4bc1..d198595 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -41,7 +41,7 @@
export default {
data() {
return {
- code: '11'
+ code: ''
}
},
onLoad(option) {
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 08884a3..05ff784 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-export const baseUrl = 'zhyq_interface/'
+// export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
diff --git a/pda/App.vue b/pda/App.vue
index aba1fdb..c0251e5 100644
--- a/pda/App.vue
+++ b/pda/App.vue
@@ -204,7 +204,7 @@
font-size: 28rpx;
}
.primaryColor {
- color: $uni-color-primary;
+ color: $uni-color-primary !important;
}
.avatar {
width: 64rpx;
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index 5deb4b4..5cb664e 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -34,9 +34,9 @@
<text>路</text>
<text>{{ item.carCodeFront.slice(2) }}</text>
</view>
- <view class="status" v-if="item.signDate"
- >绛惧埌鏃堕棿锛歿{ item.signDate.slice(5, 16) }}</view
- >
+ <view class="status green" v-if="item.status == 2">鏈堝彴绛夊緟</view >
+ <view class="status" v-if="item.status == 3">鍏ュ洯绛夊緟</view >
+ <view class="status" v-if="item.status == 7">杞Щ涓�</view >
</view>
<view class="line" v-if="item.billCode">
<text class="label">杩愯緭鍗曞彿</text>
@@ -66,6 +66,10 @@
<text class="label">杩愯緭鍏徃</text>
<text class="value">{{ item.carrierName }}</text>
</view>
+ <view class="line">
+ <text class="label primaryColor">绛惧埌鏃堕棿</text>
+ <text class="value primaryColor" v-if="item.signDate">{{ item.signDate.slice(5, 16) }}</text>
+ </view>
<!-- <view class="btns">
<view class="btn active">鍏ュ洯</view>
</view> -->
@@ -301,6 +305,9 @@
font-size: 30rpx;
color: $uni-color-primary;
}
+ .green{
+ color: #00BA67;
+ }
}
.line {
display: flex;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index 1be3932..03659a0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
@@ -58,7 +58,7 @@
private Integer areaId;
@ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插鐞� 2涓嶅鐞�", example = "1")
- @ExcelColumn(name="澶勭悊缁撴灉" ,valueMapping ="0=0寰呭鐞�;1=宸插鐞�;2=涓嶅鐞�;",index = 6,width = 6)
+ @ExcelColumn(name="澶勭悊缁撴灉" ,valueMapping ="0=寰呭鐞�;1=宸插鐞�;2=涓嶅鐞�;",index = 6,width = 6)
private Integer status;
@ApiModelProperty(value = "鐢宠澶勭悊浜虹紪鐮�(鍏宠仈member)", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
index 5c30783..9d5440a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
@@ -71,11 +71,11 @@
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField(exist = false)
- private Date startTime;
+ private String startTime;
@ApiModelProperty(value = "骞存湀鏃堕棿")
@TableField(exist = false)
private String timeInfoStr;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField(exist = false)
- private Date endTime;
+ private String endTime;
}
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 5d4c90d..5bf29d4 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
@@ -621,7 +621,8 @@
if(origin == DataSyncConfig.origin.erp){
collect= companies.stream().filter(s -> ( StringUtils.defaultString(s.getErpParentId(),"").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
}else if(origin == DataSyncConfig.origin.hk){
- collect= companies.stream().filter(s -> ( StringUtils.defaultString(s.getHkParentId(),"").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
+ collect= companies.stream().filter(s ->
+ ( StringUtils.defaultString(s.getHkParentId(),"").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
}else{
collect= companies.stream().filter(s -> (StringUtils.defaultString(s.getParentId()+"","").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index f441f45..3a6a73b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -787,6 +787,7 @@
.selectAll(HiddenDanger.class)
.selectAs(HiddenDangerParam::getCompanyId, HiddenDanger::getAreaCompanyId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId) //闅愭偅鍖哄煙
+ .eq(HiddenDanger::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(hiddenDanger.getStatus()),HiddenDanger::getStatus,hiddenDanger.getStatus())
.ge(Objects.nonNull(hiddenDanger.getQueryStartTime()), HiddenDanger::getCreateDate,hiddenDanger.getQueryStartTime())
.le(Objects.nonNull(hiddenDanger.getQueryEndTime()),HiddenDanger::getCreateDate,hiddenDanger.getQueryEndTime())
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index 43c6cf1..fe01aeb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -148,8 +148,8 @@
queryWrapper.ge(pageWrap.getModel().getStartTimeStart() != null, TrainTime::getStartTime, pageWrap.getModel().getStartTimeStart());
queryWrapper.le(pageWrap.getModel().getStartTimeEnd() != null, TrainTime::getStartTime, pageWrap.getModel().getStartTimeEnd());
- queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getName())
- .or().like(Member::getName,pageWrap.getModel().getName()));
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()), ms->ms.like(Member::getPhone,pageWrap.getModel().getKeyWords())
+ .or().like(Member::getName,pageWrap.getModel().getKeyWords()));
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
queryWrapper.orderByDesc(TrainTime::getId);
IPage<TrainTime> result = trainTimeJoinMapper.selectJoinPage(page, TrainTime.class,queryWrapper);
--
Gitblit v1.9.3