From 656fcfd2d3d35aff12cbbec41f48cec99fdef1cb Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 19 Sep 2025 18:50:01 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.2' into prod
---
src/views/tickets/ticket.vue | 8 ++++++--
src/views/license/license.vue | 11 +++++++++--
src/views/tickets/orderLog.vue | 6 +++++-
src/views/job/components/TaskTop/TaskIndustry.vue | 16 +++++++---------
src/views/resource/components/spotDetails.vue | 3 ++-
src/option/system/dictbiz.js | 2 +-
src/views/resource/patchManagement.vue | 2 +-
src/option/system/dict.js | 2 +-
8 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/src/option/system/dict.js b/src/option/system/dict.js
index e64065b..a3ebf3d 100644
--- a/src/option/system/dict.js
+++ b/src/option/system/dict.js
@@ -6,7 +6,7 @@
index: true,
selection: true,
viewBtn: true,
- menuWidth: 250,
+ menuWidth: 280,
dialogWidth: 880,
dialogClickModal: false,
diff --git a/src/option/system/dictbiz.js b/src/option/system/dictbiz.js
index e3a2742..b4477a3 100644
--- a/src/option/system/dictbiz.js
+++ b/src/option/system/dictbiz.js
@@ -6,7 +6,7 @@
index: true,
selection: true,
viewBtn: true,
- menuWidth: 250,
+ menuWidth: 280,
dialogWidth: 880,
dialogClickModal: false,
diff --git a/src/views/job/components/TaskTop/TaskIndustry.vue b/src/views/job/components/TaskTop/TaskIndustry.vue
index 63d496d..c4ac73f 100644
--- a/src/views/job/components/TaskTop/TaskIndustry.vue
+++ b/src/views/job/components/TaskTop/TaskIndustry.vue
@@ -22,15 +22,15 @@
formatter: '{b}: {c} ({d}%)',
},
legend: {
- orient: 'horizontal',
- left: 'center',
- bottom: '2%',
+ orient: 'vertical',
+ top: 'center',
+ right: '20',
textStyle: {
color: '#363636',
fontSize: 12,
},
itemWidth: 2, // 减小图例标记的宽度
- itemHeight: 3, // 减小图例标记的高度
+ itemHeight: 6, // 减小图例标记的高度
itemGap: 8, // 减小图例项之间的间距
formatter: '{name}', // 简化图例文本
},
@@ -39,10 +39,8 @@
name: '机巢事件统计',
type: 'pie',
// roseType: 'radius',
- radius: ['36%', '60%'],
- // center: ['50%', '45%'],
- // radius: '70%', // 设置饼图的半径
- center: ['50%', '36%'], // 调整饼图位置
+ radius: ['20%', '70%'],
+ center: ['30%', '50%'],
data: [],
label: {
show: true,
@@ -94,7 +92,7 @@
<style lang="scss" scoped>
.task-industry {
- width: 276px;
+ width: 300px;
height: 100%;
background: #FFFFFF;
border-radius: 8px 8px 8px 8px;
diff --git a/src/views/license/license.vue b/src/views/license/license.vue
index f8ca35d..d5b9bc3 100644
--- a/src/views/license/license.vue
+++ b/src/views/license/license.vue
@@ -79,8 +79,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
- <el-button @click="addDialogVisible = false">取消</el-button>
- <el-button type="primary" @click="createLicense">保存</el-button>
+ <el-button type="primary" @click="createLicense" :icon="CircleCheck">保存</el-button>
+ <el-button @click="addDialogVisible = false" :icon="CircleClose">取消</el-button>
</div>
</template>
@@ -91,6 +91,7 @@
<script>
import { getList, add } from '@/api/license/license'
import { mapGetters } from 'vuex'
+import { CircleCheck, CircleClose } from '@element-plus/icons-vue';
export default {
data () {
@@ -269,6 +270,12 @@
}
},
computed: {
+ CircleClose() {
+ return CircleClose
+ },
+ CircleCheck() {
+ return CircleCheck
+ },
...mapGetters(['userInfo', 'permission']),
permissionList () {
return {
diff --git a/src/views/resource/components/spotDetails.vue b/src/views/resource/components/spotDetails.vue
index 091ca0c..7b8831f 100644
--- a/src/views/resource/components/spotDetails.vue
+++ b/src/views/resource/components/spotDetails.vue
@@ -1,10 +1,11 @@
<template>
<el-dialog
- class="spotDialog"
+ class="spotDialog ztzf-dialog-mange"
:title="props.title"
v-model="uploadPatchDialog"
width="78%"
align-center
+
>
<div class="container">
<!-- 信息展示区 -->
diff --git a/src/views/resource/patchManagement.vue b/src/views/resource/patchManagement.vue
index 601062f..4078062 100644
--- a/src/views/resource/patchManagement.vue
+++ b/src/views/resource/patchManagement.vue
@@ -41,7 +41,7 @@
</template>
</avue-crud>
- <el-dialog title="上传图斑" append-to-body align-center v-model="box" width="550px">
+ <el-dialog title="上传图斑" class="ztzf-dialog-mange" append-to-body align-center v-model="box" width="550px">
<el-form
ref="ruleFormRef"
style="max-width: 600px"
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index d37b21f..9b7ac72 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -397,7 +397,7 @@
<div class="dialog-footer">
<el-button type="danger" @click="submitForm(1)">发起</el-button>
<el-button type="primary" @click="submitForm(0)">存草稿</el-button>
- <el-button @click="dialogVisible = false">取消</el-button>
+ <el-button @click="dialogVisible = false" :icon="CircleClose">取消</el-button>
</div>
</template>
</el-dialog>
@@ -846,6 +846,7 @@
import 'dayjs/locale/zh-cn'; // 导入中文语言包
import weekday from 'dayjs/plugin/weekday';
import elTooltipCopy from '@/components/ElTooltipCopy.vue';
+import { CircleClose } from '@element-plus/icons-vue';
dayjs.extend(weekday);
dayjs.locale('zh-cn');
@@ -1076,6 +1077,9 @@
}
},
computed: {
+ CircleClose() {
+ return CircleClose
+ },
...mapGetters(['userInfo', 'permission']),
filteredTabs() {
// rejection_and_draft 权限控制“已驳回”和“草稿”tab
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 5426146..1417c2f 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -420,7 +420,7 @@
>存草稿</el-button
>
- <el-button @click="handleCancel">取 消</el-button>
+ <el-button @click="handleCancel" :icon="CircleClose">取 消</el-button>
</div>
</template>
</el-dialog>
@@ -745,7 +745,7 @@
@click="rejectTicket"
>不通过</el-button
>
- <el-button @click="detailVisible = false">取消</el-button>
+ <el-button @click="detailVisible = false":icon="CircleClose">取消</el-button>
</template>
<template v-else-if="currentDetail.status === 0">
<el-button
@@ -958,6 +958,7 @@
import elTooltipCopy from '@/components/ElTooltipCopy.vue';
import getBaseConfig from '@/buildConfig/config';
import CreateQRcode from '@/components/CreateQRcode/CreateQRcode.vue';
+import { CircleClose } from '@element-plus/icons-vue';
const { envName } = getBaseConfig();
function regExp(label, name) {
var reg = new RegExp(label + '=([^&]*)(&|$)', 'g');
@@ -1249,6 +1250,9 @@
this.fetchTableData();
},
computed: {
+ CircleClose() {
+ return CircleClose
+ },
firstRowData() {
return this.tableData.length > 0 ? this.tableData[0] : null;
},
--
Gitblit v1.9.3