From 58577982a483d92559480557545acf1cf29d3e85 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 01 Aug 2025 17:08:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.196.74.78:10010/r/drone/drone-web-manage into dev
---
src/views/tickets/ticket.vue | 18 ++++++++++--------
src/views/tickets/orderLog.vue | 6 +++++-
src/buildConfig/buildConfig/config.default.js | 2 +-
src/assets/images/dataCenter/positionicon.png | 0
src/views/wel/components/backlog.vue | 23 ++++++-----------------
src/buildConfig/buildConfig/config.jiangwu.js | 1 +
6 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/assets/images/dataCenter/positionicon.png b/src/assets/images/dataCenter/positionicon.png
index 3890f49..b47c293 100644
--- a/src/assets/images/dataCenter/positionicon.png
+++ b/src/assets/images/dataCenter/positionicon.png
Binary files differ
diff --git a/src/buildConfig/buildConfig/config.default.js b/src/buildConfig/buildConfig/config.default.js
index fd70dbb..a9378d9 100644
--- a/src/buildConfig/buildConfig/config.default.js
+++ b/src/buildConfig/buildConfig/config.default.js
@@ -3,7 +3,7 @@
export default function getBaseConfig () {
return {
loginTitle: '中图智飞低空智能感知网平台', //登陆页面标题
-
+ // envName: 'jiangwu',
...defaultLayer
}
}
\ No newline at end of file
diff --git a/src/buildConfig/buildConfig/config.jiangwu.js b/src/buildConfig/buildConfig/config.jiangwu.js
index 37c5548..b1dc2e5 100644
--- a/src/buildConfig/buildConfig/config.jiangwu.js
+++ b/src/buildConfig/buildConfig/config.jiangwu.js
@@ -5,6 +5,7 @@
userLoginTitle (key) {
return '大吉山钨业无人机安防监测平台'
},
+ envName: 'jiangwu',
routerHash: true, //使用hash路由
loginTitle: '大吉山钨业无人机安防监测平台',
hideMenuTopLogo: true, // 是否隐藏菜单顶部logo
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 9dddfcb..c649ba7 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -706,6 +706,8 @@
mounted () {
this.fetchTableData()
const id = this.$route.query.id
+ console.log('idddddd',id);
+
if (id) {
// 确保 id 存在
this.handleViewDetail({ id })
@@ -1063,7 +1065,6 @@
: (this.detailTitle = '编辑工单')
this.detailVisible = true
-
// 更新航线列表，追加 wayline_file_region_vo 数据
if (data.wayline_file_region_vo) {
const newWayline = data.wayline_file_region_vo
@@ -1079,6 +1080,9 @@
}
this.initMapLine(data.device_map_infos)
+ const find = this.$store.state.tags.bsTagList.find(i => i.path === '/tickets/orderLog')
+ find && (find.query = {})
+
},
async handleCheckDetail (row) {
const response = await orderLogDetails(row.id)
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index bbd330d..3f62c26 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -18,7 +18,7 @@
@clear="handleKeyWords"
@keyup.enter="handleSearch"
/>
- <el-select
+ <!-- <el-select
v-model="filters.department"
placeholder="请选择所属单位"
class="filter-item"
@@ -30,7 +30,7 @@
:label="item.label"
:value="item.value"
/>
- </el-select>
+ </el-select> -->
<el-select
v-model="filters.type"
placeholder="请选择工单类型"
@@ -874,6 +874,8 @@
import { mapGetters } from 'vuex'
import { getAdcodeObj } from '@/utils/disposeData'
import elTooltipCopy from '@/components/ElTooltipCopy.vue'
+import getBaseConfig from '@/buildConfig/config'
+const { envName } = getBaseConfig()
function regExp (label, name) {
var reg = new RegExp(label + '=([^&]*)(&|$)', 'g')
return name.match(reg)[0].split('=')[1]
@@ -979,7 +981,7 @@
{ label: '处理人', prop: 'handler', width: 70 },
{
slot: true,
- hide: false,
+ hide: envName === 'jiangwu'? true : false,
label: '复核状态',
prop: 'isReview',
width: 90,
@@ -1089,6 +1091,7 @@
},
mounted() {
+
const href = this.$route.href;
if (this.$route?.query?.status !== undefined && this.$route?.query?.status !== null) {
this.filters.status = this.$route?.query?.status + '';
@@ -1132,12 +1135,12 @@
if (orderNumber) {
this.filters.keyword = orderNumber;
-
this.$nextTick(() => {
this.isShowInfo = true;
+ const find = this.$store.state.tags.bsTagList.find(i => i.path === '/tickets/ticket')
+ find && (find.query = {})
});
- console.log('orderNumber', orderNumber);
}
}
@@ -1913,8 +1916,6 @@
this.page.currentPage = 1;
this.$router.replace({}); //清除url参数
this.fetchTableData();
- console.log('handleSearch', this.$router);
-
},
handleKeyWords(){
this.$router.replace({}); //清除url参数
@@ -2931,7 +2932,8 @@
},
activated() {
this.handleReset();
- }
+ },
+
};
</script>
diff --git a/src/views/wel/components/backlog.vue b/src/views/wel/components/backlog.vue
index 8213936..5528887 100644
--- a/src/views/wel/components/backlog.vue
+++ b/src/views/wel/components/backlog.vue
@@ -110,16 +110,7 @@
2: { color: '#4200DD', backgroundImage: db5, borderLeftColor: '#4200DD' },
3: { color: '#FF472F', backgroundImage: db2, borderLeftColor: '#FF472F' },
}
-// 根据状态获取图标
-// const getStatusBackground = statusIndex => {
-// if (checked.value === '智飞工单') {
-// const style = zfstatusMapColor[statusIndex];
-// return style ? `url(${style.backgroundImage})` : 'none';
-// } else {
-// const style = statusMapColor[statusIndex];
-// return style ? `url(${style.backgroundImage})` : 'none';
-// }
-// };
+
const getStatus = statusIndex => {
if (checked.value === '智飞工单') {
const style = zfstatusMapColor[statusIndex]
@@ -163,7 +154,7 @@
if (checked.value === '智飞工单') {
const id = val.id
getaddOrderRecord(id)
- router.push({
+ router.replace({
path: `/tickets/orderLog`,
query: {
id,
@@ -172,12 +163,10 @@
} else {
getaddOrderRecord(val.id)
const orderNumber = val.event_num
- router.push({
- path: `/tickets/ticket`,
- query: {
- orderNumber,
- },
- })
+ router.replace({
+ path: `/tickets/ticket`,
+ query: { orderNumber },
+})
}
}
// 标记事件工单或智飞工单已读
--
Gitblit v1.9.3