From b9cc517e9de6b048c50ee83b6f47aa27c56aa88c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 09:45:25 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
admin/src/views/vehicle/driver.vue | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 1
admin/src/views/business/screenBoard.vue | 328 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
admin/.env.production | 4
admin/.env.development | 6
6 files changed, 335 insertions(+), 9 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 264deb8..4946e20 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,14 +1,16 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
+VUE_APP_SCREEN_URL_PREFIX = 'http://192.168.0.7/screen/#/'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
#VUE_APP_API_URL = 'http://192.168.1.82:10010'
-#VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
-VUE_APP_API_URL = 'http://localhost:10010'
+#VUE_APP_API_URL = 'http://localhost:10010'
#key锛�045542fc5f436b75e6c911c5c84ff8cd
#瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c
VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
+
diff --git a/admin/.env.production b/admin/.env.production
index bed91aa..4df6ba5 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,11 +1,9 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-# VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
+VUE_APP_SCREEN_URL_PREFIX = 'http://192.168.0.7/screen/#/'
-
-路
diff --git a/admin/src/views/business/screenBoard.vue b/admin/src/views/business/screenBoard.vue
new file mode 100644
index 0000000..8cf4803
--- /dev/null
+++ b/admin/src/views/business/screenBoard.vue
@@ -0,0 +1,328 @@
+<template>
+ <div class="main_app1" >
+ <div class="main_head">
+ <div class="main_head_bottom">
+ <div class="main_head_item blue">
+ <span :class="index==0?'active':''" @click="showPage('LogisticsCenter',0)">鏁版櫤鎴愬搧绠℃帶</span>
+ </div>
+ <div class="main_head_item red">
+ <span :class="index==1?'active':''" @click="showPage('LogisticsEfficiency',1)">璋冨害鑳芥晥璺熻釜</span>
+ </div>
+ <div class="main_head_item yellow">
+ <span :class="index==2?'active':''" @click="showPage('TaskEfficiency',2)">浣滀笟鏁堣兘缁熺</span>
+ </div>
+ <div class="main_head_item orange">
+ <span :class="index==3?'active':''" @click="showPage('SecurityControl',3)">鏅鸿兘瀹夐槻绠℃帶</span>
+ </div>
+ <div class="main_head_item darkBlue">
+ <span :class="index==4?'active':''" @click="showPage('FireFighting',4)">鏅烘収娑堥槻绠℃帶</span>
+ </div>
+ <div class="main_head_item yellow">
+ <span :class="index==5?'active':''" @click="showPage('EnergyConsum',5)">缁胯壊浣庣⒊杩愯惀</span>
+ </div>
+ </div>
+ </div>
+ <div class="main_table">
+ <div style="display: block; position: fixed;right: 60px;bottom: 60px;"><el-button icon="el-icon-view" style="background : #002138;border: #002138;color: white;" @click="newWIn">鏂扮獥鍙ｆ墦寮�</el-button></div>
+ <iframe :src="pageUrl" width="100%" style="min-height: 900px;"></iframe>
+ </div>
+ </div>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera';
+export default {
+ name: 'screenBoard',
+ extends: BaseOpera,
+ data () {
+ return {
+ prefix: process.env.VUE_APP_SCREEN_URL_PREFIX,
+ pageUrl: process.env.VUE_APP_SCREEN_URL_PREFIX,
+ index: 0,
+ pages: []
+ }
+ },
+ mounted () {
+ },
+ methods: {
+ showPage (url,index) {
+ this.index = index
+ this.pageUrl = this.prefix + url
+ // window.open(this.prefix + url)
+ },
+ newWIn () {
+ window.open(this.pageUrl)
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+ .main_app1 {
+ width: 100%;
+ height: calc(100% - 44px);
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding: 15px;
+ box-sizing: border-box;
+ background-color: #F4F7FC;
+ .main_head {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ margin-bottom: 10px;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
+ .main_head_title {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ span {
+ font-weight: 500;
+ font-size: 18px;
+ color: #222222;
+ margin-right: 30px;
+ }
+ }
+ .main_head_bottom {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .blue {
+ border-left: 8px solid #12BB8B;
+ }
+ .red {
+ border-left: 8px solid #F6CF46;
+ }
+ .yellow {
+ border-left: 8px solid #5DC9FB;
+ }
+ .orange {
+ border-left: 8px solid #FF9E56;
+ }
+ .darkBlue {
+ border-left: 8px solid #6B6EFF;
+ }
+ .active{
+ font-size: 18px !important;
+ font-weight: 800 !important;
+ color: #5DC9FB !important;
+ }
+ .main_head_item {
+ width: 19%;
+ height: 60px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+ box-sizing: border-box;
+ border-radius: 5px;
+ background-color: #F4F7FC;
+ span {
+ &:nth-child(1) {
+ font-weight: 600;
+ font-size: 16px;
+ color: #222222;
+ }
+ &:nth-child(2) {
+ font-weight: 400;
+ font-size: 14px;
+ color: #222222;
+ }
+ }
+ }
+ }
+ }
+
+ .main_table {
+ display: flex;
+ align-items: start;
+ justify-content: space-between;
+ margin-top: 10px;
+ .main_table_list {
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
+ width: 69%;
+ .title {
+ display: flex;
+ align-items: center;
+ span {
+ font-weight: 500;
+ font-size: 18px;
+ color: #222222;
+ }
+ }
+ .list_wu {
+ width: 100%;
+ height: 100px;
+ line-height: 100px;
+ text-align: center;
+ font-size: 16px;
+ color: #222222;
+ }
+ .list_head {
+ width: 100%;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
+ margin-top: 15px;
+ .list_head_item {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 13px;
+ color: #222222;
+ font-weight: 500;
+ border-right: 1px solid #DFE2E8;
+ }
+ }
+ .table_box {
+ width: 100%;
+ border-bottom: 1px solid #DFE2E8;
+ .list_content {
+ width: 100%;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
+ .list_head_item {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ border-right: 1px solid #DFE2E8;
+ align-items: center;
+ justify-content: center;
+ font-size: 13px;
+ color: #222222;
+ }
+ }
+ }
+ }
+ .main_table_list1 {
+ margin-left: 10px;
+ width: 30%;
+ padding: 20px;
+ box-sizing: border-box;
+ flex-shrink: 0;
+ background-color: #ffffff;
+ .title {
+ font-weight: 500;
+ font-size: 18px;
+ color: #222222;
+ }
+ .list_wu {
+ width: 100%;
+ height: 100px;
+ line-height: 100px;
+ text-align: center;
+ font-size: 16px;
+ color: #222222;
+ }
+ .list_head {
+ width: 100%;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
+ margin-top: 15px;
+ .list_head_item {
+ flex: 1.8;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 13px;
+ color: #222222;
+ font-weight: 500;
+ border-right: 1px solid #DFE2E8;
+ &:last-child {
+ flex: 1;
+ }
+ }
+ }
+ .table_box {
+ width: 100%;
+ border-bottom: 1px solid #DFE2E8;
+ .list_content {
+ width: 100%;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
+ .list_head_item {
+ flex: 1.8;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ border-right: 1px solid #DFE2E8;
+ justify-content: center;
+ text-align: center;
+ font-size: 13px;
+ color: #222222;
+ &:last-child {
+ flex: 1;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .main_content {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ height: 350px;
+
+ .title {
+ font-weight: 500;
+ font-size: 18px;
+ color: #222222;
+ }
+
+ .type_wrap {
+ flex: 1;
+ height: 100%;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
+ /*border-right: 12px solid #f7f7f7;*/
+
+ .echart1 {
+ width: 100%;
+ height: 100%;
+ margin-top: 18px;
+ }
+ }
+
+ .dept_wrap {
+ width: 520px;
+ flex-shrink: 0;
+ height: 100%;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
+ margin-left: 10px;
+ #echart2 {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ }
+ }
+</style>
diff --git a/admin/src/views/vehicle/driver.vue b/admin/src/views/vehicle/driver.vue
index b83d851..c676654 100644
--- a/admin/src/views/vehicle/driver.vue
+++ b/admin/src/views/vehicle/driver.vue
@@ -11,11 +11,10 @@
<pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
</template>
-
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { pageDriverList } from '@/api/system/user.js'
+import { pageDriverList} from '@/api/system/user.js'
import BaseComputHeight from '@/components/base/BaseComputHeight'
export default {
extends: BaseComputHeight,
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
index 6eacb96..8b97cb1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
@@ -1,8 +1,8 @@
package com.doumee.dao.business.model;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 4ad2587..ee0b767 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1759,7 +1759,6 @@
@Override
- @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void resetPassword(ResetPasswordDTO resetPasswordDTO){
if(Objects.isNull(resetPasswordDTO)
|| StringUtils.isBlank(resetPasswordDTO.getPassword())
--
Gitblit v1.9.3