From 5b2bc4884c75a76df569f34330d2267a7f3ed9ad Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 24 Jun 2025 15:56:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 0
src/views/tickets/ticket.vue | 12 ++---
src/views/wel/components/statistics.vue | 24 ++++++------
src/views/tickets/orderLog.vue | 6 +-
public/fonts/font.css | 25 ++----------
public/fonts/SourceHanSansCN-Regular.woff2 | 0
public/fonts/SourceHanSansCN-Bold.woff2 | 0
7 files changed, 24 insertions(+), 43 deletions(-)
diff --git a/public/fonts/SourceHanSansCN-Bold.otf b/public/fonts/SourceHanSansCN-Bold.otf
deleted file mode 100644
index 4b3429a..0000000
--- a/public/fonts/SourceHanSansCN-Bold.otf
+++ /dev/null
Binary files differ
diff --git a/public/fonts/SourceHanSansCN-Bold.woff2 b/public/fonts/SourceHanSansCN-Bold.woff2
new file mode 100644
index 0000000..deac255
--- /dev/null
+++ b/public/fonts/SourceHanSansCN-Bold.woff2
Binary files differ
diff --git a/public/fonts/SourceHanSansCN-Medium.otf b/public/fonts/SourceHanSansCN-Medium.otf
deleted file mode 100644
index 53e03e0..0000000
--- a/public/fonts/SourceHanSansCN-Medium.otf
+++ /dev/null
Binary files differ
diff --git a/public/fonts/SourceHanSansCN-Regular.otf b/public/fonts/SourceHanSansCN-Regular.otf
deleted file mode 100644
index 886f82f..0000000
--- a/public/fonts/SourceHanSansCN-Regular.otf
+++ /dev/null
Binary files differ
diff --git a/public/fonts/SourceHanSansCN-Regular.woff2 b/public/fonts/SourceHanSansCN-Regular.woff2
new file mode 100644
index 0000000..1f71f8e
--- /dev/null
+++ b/public/fonts/SourceHanSansCN-Regular.woff2
Binary files differ
diff --git a/public/fonts/font.css b/public/fonts/font.css
index 1b810a1..9451657 100644
--- a/public/fonts/font.css
+++ b/public/fonts/font.css
@@ -1,6 +1,6 @@
@font-face {
font-family: "Source Han Sans CN";
- src: url("SourceHanSansCN-Regular.otf") format("opentype");
+ src: url("SourceHanSansCN-Regular.woff2") format("opentype");
font-weight: 400;
font-style: normal;
font-display: swap;
@@ -8,15 +8,7 @@
@font-face {
font-family: "Source Han Sans CN";
- src: url("SourceHanSansCN-Medium.otf") format("opentype");
- font-weight: 500;
- font-style: normal;
- font-display: swap;
-}
-
-@font-face {
- font-family: "Source Han Sans CN";
- src: url("SourceHanSansCN-Bold.otf") format("opentype") ;
+ src: url("SourceHanSansCN-Bold.woff2") format("opentype") ;
font-weight: 700;
font-style: normal;
font-display: swap;
@@ -25,29 +17,20 @@
@font-face {
font-family: "Segoe UI";
- src: url("SourceHanSansCN-Regular.otf") format("opentype");
+ src: url("SourceHanSansCN-Regular.woff2") format("opentype");
font-weight: 400;
font-style: normal;
font-display: swap;
}
-@font-face {
- font-family: "Segoe UI";
- src: url("SourceHanSansCN-Medium.otf") format("opentype");
- font-weight: 500;
- font-style: normal;
- font-display: swap;
-}
@font-face {
font-family: "Segoe UI";
- src: url("SourceHanSansCN-Bold.otf") format("opentype") ;
+ src: url("SourceHanSansCN-Bold.woff2") format("opentype") ;
font-weight: 700;
font-style: normal;
font-display: swap;
}
-
-
/* 额外的标题字体 */
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index a5adc5c..9f6c7f4 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -4,9 +4,9 @@
* @LastEditors: shuishen 1109946754@qq.com
* @LastEditTime: 2025-04-28 11:38:16
* @FilePath: \drone-web-manage\src\views\tickets\orderLog.vue
- * @Description:
- *
- * Copyright (c) 2025 by shuishen, All Rights Reserved.
+ * @Description:
+ *
+ * Copyright (c) 2025 by shuishen, All Rights Reserved.
-->
<template>
<basic-container>
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index cf827b8..6bf9848 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -74,7 +74,7 @@
</el-tabs>
<!-- 新建工单对话框 -->
- <el-dialog v-model="dialogVisible" title="新建工单" width="70%" :close-on-click-modal="false" @close="resetForm">
+ <el-dialog v-model="dialogVisible" v-if="dialogVisible" title="新建工单" width="70%" :close-on-click-modal="false" @close="resetForm">
<el-form :model="form" :rules="rules" ref="form" label-width="90px" class="create-ticket-form">
<div class="form-section">
<el-row :gutter="16">
@@ -1351,14 +1351,10 @@
handleLocationChange (val) {
let locationValue = val.value
- console.log('handleLocationChange', locationValue)
if (locationValue && locationValue.length >= 2) {
// 兼容第三项为地址
- this.form.location = [
- Number(locationValue[0]),
- Number(locationValue[1]),
- locationValue[2] || '',
- ]
+ const [lng, lat] = gcj02ToWgs84(locationValue[0], locationValue[1])
+ this.form.location = [Number(lng), Number(lat), locationValue[2] || '',]
this.form.address = locationValue[2] || ''
} else {
this.form.location = []
@@ -1471,6 +1467,8 @@
handleAdd () {
this.dialogVisible = true
+ this.mapParams.center = null
+ this.form.location = []
},
resetForm () {
diff --git a/src/views/wel/components/statistics.vue b/src/views/wel/components/statistics.vue
index 295996a..cb3fb32 100644
--- a/src/views/wel/components/statistics.vue
+++ b/src/views/wel/components/statistics.vue
@@ -198,28 +198,28 @@
// 样式配置对象
const statusStyles = {
机巢保险: {
- 0: { class: 'expired', color: '#7C8091', background: '#7C8091' },
- 1: { class: 'normal', color: '#1B94FF', background: '#1B94FF' },
+ 0: { class: 'expired', color: 'rgba(186, 186, 186, 1)', background: 'rgba(186, 186, 186, 1)' },
+ 1: { class: 'normal', color: 'rgba(27, 148, 255, 1)', background: 'rgba(27, 148, 255, 1)' },
},
无人机流量: {
- 0: { class: 'offline', color: '#11CE3E', background: '#11CE3E' },
- 1: { class: 'flying', color: '#1B94FF', background: '#1B94FF' },
- 2: { class: 'flying', color: '#7C8091', background: '#7C8091' },
+ 0: { class: 'offline', color: 'rgba(0, 180, 69, 1)', background: 'rgba(0, 180, 69, 1)' },
+ 1: { class: 'flying', color: 'rgba(186, 186, 186, 1)', background: 'rgba(186, 186, 186, 1)' },
+ 2: { class: 'flying', color: 'rgba(255, 36, 36, 1)', background: 'rgba(255, 36, 36, 1)' },
},
监控设备: {
- 0: { class: 'offline', color: '#bababa', background: '#bababa' },
- 1: { class: 'flying', color: '#1B94FF', background: '#1B94FF' },
+ 0: { class: 'offline', color: 'rgba(186, 186, 186, 1)', background: 'rgba(186, 186, 186, 1)' },
+ 1: { class: 'flying', color: 'rgba(255, 106, 0, 1)', background: 'rgba(255, 106, 0, 1)' },
},
移动机巢: {
- '-1': { class: 'offline', color: '#bababa', background: '#bababa' },
- 4: { class: 'flying', color: '#1B94FF', background: '#1B94FF' },
+ '-1': { class: 'offline', color: 'rgba(186, 186, 186, 1)', background: 'rgba(186, 186, 186, 1)' },
+ 4: { class: 'flying', color: 'rgba(255, 106, 0, 1)', background: 'rgba(255, 106, 0, 1)' },
},
// 默认样式配置
default: {
- 0: { class: 'warning', color: '#1b94ff', background: '#1b94ff' },
- 4: { class: 'success', color: '#11ce3e', background: '#11ce3e' },
- '-1': { class: 'success', color: '#bababa', background: '#bababa' },
+ 0: { class: 'warning', color: 'rgba(0, 180, 69, 1)', background: 'rgba(0, 180, 69, 1)' },
+ 4: { class: 'success', color: 'rgba(255, 106, 0, 1)', background: 'rgba(255, 106, 0, 1)' },
+ '-1': { class: 'success', color: 'rgba(186, 186, 186, 1)', background: 'rgba(186, 186, 186, 1)' },
},
};
--
Gitblit v1.9.3