From f45b771a3d47b7d4bba33899b77e833d607db1e8 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 15 Aug 2025 14:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v5.0/5.0.2' into feature/v5.0/5.0.2
---
src/views/tickets/ticket.vue | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 87c2bf8..86165c6 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -31,7 +31,7 @@
:value="item.value"
/>
</el-select> -->
- <el-select
+ <!-- <el-select
v-model="filters.type"
placeholder="请选择工单类型"
class="filter-item"
@@ -44,7 +44,7 @@
:label="item.label"
:value="item.value"
/>
- </el-select>
+ </el-select> -->
<el-date-picker
v-model="filters.dateRange"
type="daterange"
@@ -69,7 +69,7 @@
:value="item.value"
/>
</el-select>
- <el-select
+ <!-- <el-select
v-model="filters.algorithm"
placeholder="请选择关联算法"
class="filter-item"
@@ -82,7 +82,21 @@
:label="item.dict_value"
:value="item.dict_key"
/>
- </el-select>
+ </el-select> -->
+ <el-tree-select
+ popper-class="custom-tree-select"
+ :style="{ width: pxToRem(186) }"
+ placeholder="请选择关联算法"
+ v-model="dictKey"
+ :data="dataList"
+ :default-expanded-keys="[dictKey]"
+ check-strictly
+ node-key="id"
+ :props="treePropsSF"
+ @node-click="handleSFNodeClick"
+ clearable
+ @clear="handleClear"
+ />
<el-select
v-model="filters.isReview"
placeholder="请选择复核状态"
@@ -899,6 +913,7 @@
getReviewById,
getCreateEventJob,
} from '@/api/tickets/ticket'
+import { getSFDictionaryTree } from '@/api/job/task';
import { export_json_to_excel } from '@/utils/exportExcel'
import geoJson from '@/assets/geoJson.json'
import { mapGetters } from 'vuex'
@@ -1111,6 +1126,13 @@
// 复核弹窗
reCheckDialog: false,
+ treePropsSF: {
+ label: 'dictValue',
+ value: 'id',
+ children: 'children',
+ },
+ dictKey: '',
+ dataList: [],
};
},
created() {
@@ -1123,6 +1145,8 @@
},
mounted() {
+
+ this.getAlgorithmList()
const href = this.$route.href;
if (this.$route?.query?.status !== undefined && this.$route?.query?.status !== null) {
@@ -1392,6 +1416,46 @@
},
methods: {
+ // 算法
+ getAlgorithmList() {
+ getSFDictionaryTree({code:'SF'}).then((res) => {
+ if (res.data.code === 200) {
+ const result = res.data.data[0].children
+ // 过滤第一层数据
+ const filteredData = result.map(item => {
+ // 过滤第二层数据
+ const children = item.children?.map(child => ({
+ ...child,
+ children: [] // 清空第三层数据
+ }))
+ return {
+ ...item,
+ children: children || []
+ }
+ })
+ this.dataList = filteredData
+ }
+ })
+ },
+
+ handleSFNodeClick(data) {
+ this.filters.type = ''
+ this.filters.algorithm = ''
+ if (data.children && data.children.length) {
+ // 获取子节点dictKey
+ this.filters.type = data.dictKey
+ } else {
+ this.filters.algorithm = data.dictKey
+ }
+ // 更新列表请求
+ this.fetchTableData();
+ },
+ handleClear() {
+ this.dictKey = ''
+ this.filters.algorithm = ''
+ this.filters.type = ''
+ this.fetchTableData();
+ },
handleCellClick(row, column) {
console.log(row, column.no);
if (column.no === 2) {
--
Gitblit v1.9.3