From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/tickets/ticket.vue | 287 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 229 insertions(+), 58 deletions(-)
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 8cb2837..486563c 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -31,11 +31,12 @@
:value="item.value"
/>
</el-select> -->
- <el-select
+ <!-- <el-select
v-model="filters.type"
placeholder="请选择工单类型"
class="filter-item"
clearable
+ @change="handleSearch"
>
<el-option
v-for="item in types"
@@ -43,7 +44,7 @@
:label="item.label"
:value="item.value"
/>
- </el-select>
+ </el-select> -->
<el-date-picker
v-model="filters.dateRange"
type="daterange"
@@ -59,6 +60,7 @@
placeholder="请选择状态"
class="filter-item"
clearable
+ @change="handleSearch"
>
<el-option
v-for="item in statuses"
@@ -67,11 +69,12 @@
:value="item.value"
/>
</el-select>
- <el-select
+ <!-- <el-select
v-model="filters.algorithm"
placeholder="请选择关联算法"
class="filter-item"
clearable
+ @change="handleSearch"
>
<el-option
v-for="item in algorithms"
@@ -79,12 +82,48 @@
: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-tree-select
+ style="z-index: 1000"
+ :teleported="false"
+ class="custom-tree-select"
+ :style="{ width: pxToRem(186) }"
+ v-model="dictKey"
+ :data="dataList"
+ :default-expanded-keys="[dictKey]"
+ :props="treePropsSF"
+ :render-after-expand="false"
+ :default-checked-keys="checkedKeys"
+ node-key="id"
+ multiple
+ show-checkbox
+ collapse-tags
+ collapse-tags-tooltip
+ clearable
+ @check="handleCheck"
+ @node-click="handleSFNodeClick"
+ @clear="handleClear"
+ />
<el-select
v-model="filters.isReview"
placeholder="请选择复核状态"
class="filter-item"
clearable
+ @change="handleSearch"
>
<el-option
v-for="item in reviewStatuses"
@@ -269,7 +308,7 @@
:disabled="!form.type"
>
<el-option
- v-for="item in algorithms"
+ v-for="item in algorithms2"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -361,7 +400,7 @@
</el-form>
<template #footer>
<div class="dialog-footer">
-
+
<el-button type="danger" :loading="submitLoading" @click="submitForm">发布</el-button>
<el-button type="infoprimary" plain :loading="draftLoading" @click="saveDraft"
>存草稿</el-button
@@ -374,7 +413,7 @@
</el-dialog>
<!-- 工单详情对话框 -->
- <el-dialog align-center v-model="detailVisible" title="工单详情" width="80%" append-to-body>
+ <el-dialog class="custom-dialog" align-center v-model="detailVisible" title="工单详情" width="80%" append-to-body>
<div class="detail-container">
<div class="detail-top-title">
<div class="event-title-center event-orderNumber">
@@ -417,7 +456,8 @@
</el-steps>
</div>
- <!-- 基本信息表格 -->
+ <div class="PopUpTableScrolls">
+ <!-- 基本信息表格 -->
<el-table :show-header="false" :data="formattedDetailFields" border class="tableCss">
<el-table-column prop="label1" label="基本信息" width="150">
<template #default="{ row }">
@@ -459,7 +499,7 @@
class="required-input"
>
<el-option
- v-for="item in algorithms"
+ v-for="item in algorithms2"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -472,7 +512,7 @@
<el-table-column prop="label2" label="基本信息" width="150">
<template #default="{ row }">
<!-- 添加必填星号的标签 -->
-
+
<span
v-if="
currentDetail.status === 0 &&
@@ -488,8 +528,8 @@
<el-table-column>
<template #default="{ row }">
<!-- 修改工单类型和工单内容的显示 -->
-
-
+
+
<template
v-if="
currentDetail.status === 0 &&
@@ -574,7 +614,7 @@
<!-- 图片和地图部分 -->
<div class="media-section">
<el-row :gutter="20">
-
+
<el-col :span="12">
<div class="media-box">
<div class="media-title">事件图片</div>
@@ -633,28 +673,46 @@
</div>
</template>
<template v-else>
- <div class="media-title">地图标记事件点</div>
+ <div class="media-title">地图标记事件点
+ <el-popover v-if="currentDetail.status === 3 || currentDetail.status === 0"
+ popper-class="custom-qrcode-popover"
+ :width="120"
+ :visible="currentDetail.showQR && detailVisible"
+ placement="top"
+ title=""
+ trigger="click"
+
+ >
+ <template #reference>
+ <img @click.stop="handleQRCode(currentDetail)" class="QRCodeImg" src="@/assets/images/dataCenter/qrCode.svg" alt="" title="事件导航" />
+ </template>
+ <div class="qrcode-content">
+ <CreateQRcode v-if="currentDetail.showQR && detailVisible" :latAndLon="currentDetail.location"></CreateQRcode>
+ </div>
+ </el-popover>
+ </div>
<div class="media-content">
<map-container v-if="detailVisible" ref="MapContainer"></map-container>
</div>
</template>
</div>
</el-col>
-
-
+
+
</el-row>
</div>
+ </div>
<!-- 操作按钮 -->
- <div class="dialog-footer">
+ <div class="dialog-footer1">
<div
class="leftBtn"
:class="currentIndex === 0 ? 'disableds' : ''"
@click="leftClick"
>
- <el-icon><ArrowLeft /></el-icon>
+ 上一页
</div>
- <div>
+ <div class="btngroups">
<template v-if="currentDetail.status === 2">
<!-- 待审核 -->
<el-button
@@ -713,7 +771,7 @@
class="leftBtn"
@click="rightClick"
>
- <el-icon><ArrowRight /></el-icon>
+ 下一页
</div>
</div>
</div>
@@ -729,6 +787,7 @@
<el-form :model="dispatchForm" :rules="dispatchRules" ref="dispatchForm" label-width="100px">
<el-form-item label="选择部门" prop="department">
<el-select
+
v-model="dispatchForm.department"
placeholder="请选择部门"
@change="handleDispatchDepartmentChange"
@@ -743,6 +802,7 @@
</el-form-item>
<el-form-item label="选择处理人" prop="handler">
<el-select
+ filterable
v-model="dispatchForm.handler"
placeholder="请选择处理人"
:disabled="!dispatchForm.department"
@@ -874,12 +934,14 @@
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'
import { getAdcodeObj } from '@/utils/disposeData'
import elTooltipCopy from '@/components/ElTooltipCopy.vue'
import getBaseConfig from '@/buildConfig/config'
+import CreateQRcode from '@/components/CreateQRcode/CreateQRcode.vue'
const { envName } = getBaseConfig()
function regExp (label, name) {
var reg = new RegExp(label + '=([^&]*)(&|$)', 'g')
@@ -887,7 +949,7 @@
}
export default {
- components: { elTooltipCopy },
+ components: { elTooltipCopy,CreateQRcode },
name: 'TicketPage',
data() {
return {
@@ -929,6 +991,7 @@
],
algorithms: [],
+ algorithms2: [],
statuses: [
{ label: '待审核', value: '2' },
{ label: '待处理', value: '0' },
@@ -963,9 +1026,9 @@
// { label: "序号", prop: "id", width: 70 },
{ label: '工单编号', prop: 'orderNumber', width: 170 },
{ label: '工单名称', prop: 'orderName', width: 150, overHidden: true, tooltip: true },
- { label: '所属单位', prop: 'department',width: 150, overHidden: true, tooltip: true },
+ { label: '所属单位', prop: 'department', overHidden: true, tooltip: true },
{ label: '发起时间', prop: 'startTime', width: 160 },
- { label: '关联算法', prop: 'aiType', width: 150, overHidden: true, tooltip: true },
+ { label: '关联算法', prop: 'aiType', overHidden: true, tooltip: true },
{
label: '工单类型',
prop: 'type',
@@ -1084,6 +1147,14 @@
// 复核弹窗
reCheckDialog: false,
+ treePropsSF: {
+ label: 'dictValue',
+ value: 'id',
+ children: 'children',
+ },
+ dictKey: '',
+ dataList: [],
+ checkedKeys: [],
};
},
created() {
@@ -1096,7 +1167,9 @@
},
mounted() {
-
+
+ this.getAlgorithmList()
+
const href = this.$route.href;
if (this.$route?.query?.status !== undefined && this.$route?.query?.status !== null) {
this.filters.status = this.$route?.query?.status + '';
@@ -1268,7 +1341,6 @@
{ label: '当前状态', value: this.mapStatus(this.currentDetail.status) },
{ label: '事件地址', value: this.currentDetail.address || this.currentDetail.latAndLon }, // 包含经纬度信息
{ label: '关联算法',
- // value: this.currentDetail.aiType
value:
this.algorithms.find(t => t.value === this.currentDetail.aiType)?.label ||
this.currentDetail.aiType ||
@@ -1292,7 +1364,9 @@
value2: filteredFields[i + 1]?.value || (filteredFields[i + 1]?.label ? '暂无数据' : ''),
});
}
+
return formattedFields;
+
},
dynamicFixedStatuses() {
// 直接使用接口返回的 stepInfos
@@ -1364,6 +1438,49 @@
},
methods: {
+ handleCheck(data, { checkedKeys, checkedNodes }) {
+ this.checkedKeys = checkedKeys
+ // 获取所有选中节点的 dictKey
+ const selectedDictKeys = checkedNodes.map(node => node.dictKey).filter(Boolean)
+ this.filters.type = selectedDictKeys
+ this.fetchTableData();
+ },
+ // 算法
+ 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) {
+ console.log(data.dictKey, '666666666')
+ this.filters.type = ''
+ this.filters.algorithm = ''
+ this.filters.type = 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) {
@@ -1400,12 +1517,16 @@
this.currentDetail.processingDetail = this.currentDetail.content;
this.handleViewDetail(this.currentDetail);
+
// 如果使用地图组件，需要更新地图标记
this.$nextTick(() => {
if (this.$refs.MapContainer && this.currentDetail.location) {
this.$refs.MapContainer.initAddEntity('point', this.currentDetail.location);
}
});
+ },
+ async handleQRCode (val){
+ val.showQR = !val.showQR
},
async loadAMapScripts() {
try {
@@ -1524,14 +1645,16 @@
console.log('工单类型',this.types);
console.log('关联算法',this.allAlgorithms );
// 确保算法数据的映射一致
- // this.algorithms =
- // ai_type?.map(item => ({
- // dict_key: item.dict_key,
- // dict_value: item.dict_value,
- // // 同时添加 label 和 value 以兼容两处使用
- // label: item.dict_value,
- // value: item.dict_key,
- // })) || [];
+ this.algorithms =
+ ai_type?.map(item => ({
+ dict_key: item.dict_key,
+ dict_value: item.dict_value,
+ // 同时添加 label 和 value 以兼容两处使用
+ label: item.dict_value,
+ value: item.dict_key,
+ })) || [];
+
+ this.algorithms2 = _.cloneDeep(this.algorithms)
// 构建用户ID和名称的映射关系
this.userNameToIdMap = {};
@@ -1546,26 +1669,25 @@
},
// 工单类型变化时触发
handleTypeChange(typeValue) {
+ this.form.algorithm = []
if (!typeValue) {
// 未选择类型时清空算法列表
- this.algorithms = [];
+ this.algorithms2 = [];
return;
}
const matchedCategory = this.allAlgorithms.find(
- category => category.dict_key === typeValue
+ category => category.dict_key === typeValue
);
if (!matchedCategory || !matchedCategory.algorithms || matchedCategory.algorithms.length === 0) {
// 无匹配的算法时清空
- this.algorithms = [];
+ this.algorithms2 = [];
this.$message.info('该工单类型暂无关联算法');
return;
}
-// console.log('matchedCategory',matchedCategory);
-
- this.algorithms = matchedCategory.algorithms.map(algo => ({
- label: algo.dict_value,
+ this.algorithms2 = matchedCategory.algorithms.map(algo => ({
+ label: algo.dict_value,
value: algo.dict_key,
dict_key: algo.dict_key,
dict_value: algo.dict_value
@@ -1580,7 +1702,7 @@
try {
const currentTab = this.tabs.find(tab => tab.name === this.activeTab);
const params = {
- word_order_type: this.filters.type || undefined,
+ word_order_types: this.filters.type || undefined,
status:
currentTab?.name === 'myTickets'
? undefined
@@ -1917,6 +2039,7 @@
},
handleReset() {
+ this.dictKey = '';
this.filters = {
keyword: '',
department: '',
@@ -2047,12 +2170,15 @@
this.currentDetail = {
...detailData,
// address: null,
+ showQR: false,
latAndLon: _.round(detailData.location[0], 6) + ',' + _.round(detailData.location[1], 6),
};
console.log('this.currentDetail', this.currentDetail);
this.detailVisible = true;
this.handleTypeChange(this.currentDetail.type)
+ console.log('this.currentDetail.location',this.currentDetail.location);
+
this.$nextTick(() => {
if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
this.$refs.MapContainer.initAddEntity('point', this.currentDetail.location);
@@ -2344,8 +2470,8 @@
this.$message.warning('请填写工单名称');
return;
}
- if (!this.currentDetail.type) {
- this.$message.warning('请选择工单类型');
+ if (!this.currentDetail.aiType) {
+ this.$message.warning('请选择关联算法');
return;
}
if (!this.currentDetail.content || !this.currentDetail.content.trim()) {
@@ -2355,6 +2481,9 @@
// 通过验证后,打开派发对话框
this.dispatchDialogVisible = true;
+
+ console.log('受理',this.currentDetail);
+
},
hasProcessingBtnPermission() {
// undefined 或 false 都返回 false，只有 true 返回 true
@@ -2394,6 +2523,8 @@
return;
}
this.dispatchLoading = true;
+ console.log('派发成功',this.currentDetail);
+
this.$refs.dispatchForm.validate(async valid => {
if (valid) {
try {
@@ -2407,7 +2538,9 @@
content: this.currentDetail.content, // 使用 content 替代原来的 remark
createDept: this.dispatchForm.department, // 派发部门 ID
updateUser: this.dispatchForm.handler, // 处理人 ID
+ aiType:this.currentDetail.aiType
};
+ console.log('派发',data);
const file = this.currentDetail.file || null; // 如果没有文件，则为 null
@@ -2950,7 +3083,12 @@
};
</script>
-
+<style lang="scss">
+.custom-dialog { max-height: 96vh; }
+.custom-qrcode-popover {
+min-width: 120px !important;
+}
+</style>
<style lang="scss" scoped>
::v-deep(.el-tabs) {
@@ -2989,11 +3127,11 @@
gap: 8px; // 使用 gap 统一设置间距
.filter-item {
- width: 160px; // 减小宽度
+ width: 280px; // 减小宽度
}
.date-picker {
- width: 240px; // 日期选择器宽度适当调整
+ // width: 240px; // 日期选择器宽度适当调整
}
.el-button {
@@ -3157,10 +3295,7 @@
}
.dialog-footer {
-display: flex;
text-align: center;
- align-items: center;
- justify-content: space-between;
padding-top: 16px;
border-top: 1px solid #ebeef5;
@@ -3176,7 +3311,33 @@
}
}
}
+.dialog-footer1 {
+ position: sticky;
+ bottom: 28px;
+ left: 0;
+ right: 0;
+ background: white;
+ z-index: 10;
+ padding: 16px 20px;
+ border-top: 1px solid #ebeef5;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .el-button + .el-button {
+ margin-left: 12px;
+ }
+.btngroups {
+margin-left: 12px;
+}
+ .el-button {
+ padding: 9px 20px;
+ &:last-child {
+ margin-left: 12px;
+ margin-right: 12px;
+ }
+ }
+}
.map-container {
width: 100%;
height: 400px;
@@ -3338,18 +3499,16 @@
}
.leftBtn {
- width: 36px;
- height: 36px;
+ width: 70px;
+ height: 32px;
background-color: #999;
- border-radius: 50%;
+ border-radius: 5px;
text-align: center;
- line-height: 36px;
+line-height: 32px;
color: #fff;
cursor: pointer;
opacity: 0.8;
-display: flex;
-align-items: center;
-justify-content: center;
+
}
.disableds {
@@ -3358,7 +3517,11 @@
pointer-events: none;
opacity: 0.3 !important;
}
-
+.PopUpTableScrolls{
+height: 600px;
+overflow-y: scroll;
+overflow-x: hidden;
+}
.media-box {
width: 100%;
border: 1px solid #dcdfe6;
@@ -3370,11 +3533,19 @@
.media-title {
font-weight: bold;
margin-bottom: 5px;
+ display: flex;
+ align-items: center;
+ .QRCodeImg{
+ width: 18px;
+ height: 18px;
+ cursor: pointer;
+ padding-bottom: 1px;
+ }
}
.media-content {
position: relative;
- height: 250px;
+ height: 500px;
:deep(.el-image) {
width: 100% !important;
--
Gitblit v1.9.3