From 1a26eb2a96053c57387895e401cced7b6cfd95e7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sun, 20 Apr 2025 12:26:42 +0800
Subject: [PATCH] feat: 跳转后台调整
---
.env.development | 2 +-
src/views/Home/HomeRight/EventOverview.vue | 6 +++++-
src/components/DeviceJobDetails/JobRelatedEvents.vue | 13 +++++--------
src/components/UserOperate.vue | 2 ++
.env | 6 ++----
src/assets/images/home/homeRight/leftTriangle.png | 0
src/views/Home/RSide.vue | 2 ++
.env.test | 2 +-
src/views/SignMachineNest/MachineLeft/InspectionRaskDetails.vue | 6 +++---
9 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/.env b/.env
index 5128c3d..b109a58 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,5 @@
+#开发、测试、生产环境共用环境配置
+
VITE_APP_API = /api
#调试参数
VITE_APP_DEBUG_KEY = saber
@@ -9,7 +11,3 @@
VITE_APP_TDT_TOKEN = c6eea7dad4fa1e2d1e32ec0e7c9735db
#cesium token
VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M
-
-# 环境路径
-VITE_APP_TICKET_BASE_URL=https://wrj.shuixiongit.com
-VITE_APP_TICKET_BACKUP_URL=https://aisky.org.cn
\ No newline at end of file
diff --git a/.env.development b/.env.development
index d188b0a..6a9bca3 100644
--- a/.env.development
+++ b/.env.development
@@ -11,5 +11,5 @@
# 航线文件地址
VITE_APP_AIRLINE_URL = https://wrj.shuixiongit.com/minio/cloud-bucket
-#系统运维
+#管理后台地址
VITE_APP_ADMIN_URL = 'https://wrj.shuixiongit.com/manage/wel/index'
diff --git a/.env.test b/.env.test
index 519d7bf..39adca1 100644
--- a/.env.test
+++ b/.env.test
@@ -6,5 +6,5 @@
# 航线文件地址
VITE_APP_AIRLINE_URL = https://wrj.shuixiongit.com/minio/cloud-bucket
-#系统运维
+#管理后台地址
VITE_APP_ADMIN_URL = 'https://wrj.shuixiongit.com/manage/wel/index'
diff --git a/src/assets/images/home/homeRight/leftTriangle.png b/src/assets/images/home/homeRight/leftTriangle.png
new file mode 100644
index 0000000..574073a
--- /dev/null
+++ b/src/assets/images/home/homeRight/leftTriangle.png
Binary files differ
diff --git a/src/components/DeviceJobDetails/JobRelatedEvents.vue b/src/components/DeviceJobDetails/JobRelatedEvents.vue
index 93e6713..980e4c3 100644
--- a/src/components/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/components/DeviceJobDetails/JobRelatedEvents.vue
@@ -59,23 +59,20 @@
const total = ref(10)
const examine = row => {
const orderNumber = row.event_num
- const primaryUrl = `${import.meta.env.VITE_APP_TICKET_BASE_URL}/manage/tickets/ticket?orderNumber=${orderNumber}`
- const backupUrl = `${import.meta.env.VITE_APP_TICKET_BACKUP_URL}/manage/tickets/ticket?orderNumber=${orderNumber}`
- const win = window.open(primaryUrl, '_blank')
- if (!win || win.closed) {
- window.open(backupUrl, '_blank')
- }
+ const adminUrl = import.meta.env.VITE_APP_ADMIN_URL
+ const targetPath = `/tickets/ticket?orderNumber=${orderNumber}`;
+ window.open(`${adminUrl}?redirect=${encodeURIComponent(targetPath)}`, '_blank');
}
const wayLineJodInfoId = inject('wayLineJodInfoId')
const getList = () => {
params.value.way_line_jod_info_id = wayLineJodInfoId.value
-
+
getDeviceEventList(params.value, sizeParams.value).then(res => {
const resData = res?.data?.data || {}
list.value = resData.records
total.value = resData.total
-
+
})
}
diff --git a/src/components/UserOperate.vue b/src/components/UserOperate.vue
index 5f07fff..6cab918 100644
--- a/src/components/UserOperate.vue
+++ b/src/components/UserOperate.vue
@@ -1,6 +1,7 @@
<script setup>
import { fullscreenToggel } from '@/utils/util';
import { useStore } from 'vuex';
+import { ElMessage } from 'element-plus'
const router = useRouter();
const store = useStore();
const dropdownClick = val => {
@@ -20,6 +21,7 @@
}
const info = () =>{
+ ElMessage.warning('加急开发中...')
console.log('点击了个人信息');
}
</script>
diff --git a/src/views/Home/HomeRight/EventOverview.vue b/src/views/Home/HomeRight/EventOverview.vue
index d87301b..7f5f1c5 100644
--- a/src/views/Home/HomeRight/EventOverview.vue
+++ b/src/views/Home/HomeRight/EventOverview.vue
@@ -40,7 +40,7 @@
<img class="completion-left-img" :src="completionLeft" alt="" />
<div class="completion-text">事件类型完成率情况</div>
<div class="completion-separator"></div>
- <img class="completion-left-img" :src="completionLeft" alt="" />
+ <img class="completion-left-img" :src="leftTriangle" alt="" />
</div>
<div class="chart" ref="echartsRef"></div>
@@ -56,6 +56,7 @@
import overviewImg5 from '@/assets/images/home/homeRight/overview5.png'
import overviewImg6 from '@/assets/images/home/homeRight/overview6.png'
import completionLeft from '@/assets/images/home/homeRight/completionLeft.png'
+import leftTriangle from '@/assets/images/home/homeRight/leftTriangle.png'
import * as echarts from 'echarts'
import CommonDateTime from '@/components/CommonDateTime.vue'
import VSelectLoad from '@/directive/selectLoad'
@@ -153,6 +154,9 @@
width: 2, // 线条宽度
type: 'solid', // 线条类型
},
+ tooltip: {
+ valueFormatter: (value) => value + '%'
+ },
symbol: 'circle', // 数据点符号
symbolSize: 6, // 数据点符号大小
emphasis: {
diff --git a/src/views/Home/RSide.vue b/src/views/Home/RSide.vue
index 7e41a56..98c980d 100644
--- a/src/views/Home/RSide.vue
+++ b/src/views/Home/RSide.vue
@@ -40,6 +40,7 @@
import tc from '@/assets/images/rSide/tc.png'
import tc1 from '@/assets/images/rSide/tc1.png'
import cesiumOperation from '@/utils/cesium-tsa'
+import { ElMessage } from 'element-plus'
let logIndex = ref(3)
const enterHover = value => {
@@ -61,6 +62,7 @@
activeIndex.value = activeIndex.value === 1 ? null : value
}
if (value === 2) {
+ ElMessage.warning('加急开发中...')
activeIndex.value = activeIndex.value === 2 ? null : value
}
}
diff --git a/src/views/SignMachineNest/MachineLeft/InspectionRaskDetails.vue b/src/views/SignMachineNest/MachineLeft/InspectionRaskDetails.vue
index f9f9890..d2ff6e6 100644
--- a/src/views/SignMachineNest/MachineLeft/InspectionRaskDetails.vue
+++ b/src/views/SignMachineNest/MachineLeft/InspectionRaskDetails.vue
@@ -109,7 +109,7 @@
},
],
}
-
+import _ from 'lodash'
// chart.setOption(option);
const pieOption = {
@@ -138,7 +138,7 @@
tarValue = data[i].value
}
}
- let percentage = ((tarValue / total) * 100).toFixed(1)
+ let percentage = total ? _.round(((tarValue / total) * 100),1) : 0
return `${name} ${percentage}%`
},
},
@@ -167,7 +167,7 @@
{ value: 0, name: '处理中', itemStyle: { color: '#FFC398' } },
{ value: 0, name: '已完成', itemStyle: { color: '#AFD9FB' } },
// { value: 0, name: '待分拨', itemStyle: { color: '#E9C81A' } },
-
+
{ value: 0, name: '已完结', itemStyle: { color: '#11C4FF' } },
],
},
--
Gitblit v1.9.3