From 1e89b87f5bc035d1241b52910d04db4bdb91e9eb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 16 八月 2024 15:32:43 +0800
Subject: [PATCH] 请求时间延长，点位标签取消重点点位
---
src/utils/request.js | 3 +
src/views/system/point/index.vue | 3 -
src/views/system/data-manage/data-detail/list.js | 65 ++++++++++++++++++++------------
3 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index ffb0d21..e2f8ccd 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,7 +17,8 @@
// axios涓姹傞厤缃湁baseURL閫夐」锛岃〃绀鸿姹俇RL鍏叡閮ㄥ垎
baseURL: process.env.VUE_APP_BASE_API,
// 瓒呮椂
- timeout: 10000
+ //榛樿10绉� 淇敼涓�20绉�
+ timeout: 20000
})
// request鎷︽埅鍣�
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index 5491021..47e9481 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -66,42 +66,57 @@
{
label: '璁惧缂栫爜',
align: 'center',
- prop: 'serialNumber',
+ prop: 'serialNumber.showValue',
},
{
label: '璁惧鍚嶇О',
align: 'center',
- prop: 'name'
- },
- {
- label: '鐩戞帶鐐逛綅绫诲瀷',
- align: 'center',
- prop: 'siteType'
- },
- {
- label: 'Mac鍦板潃',
- align: 'center',
- prop: 'macAddr'
- },
- {
- label: 'IPV4/IPV6',
- align: 'center',
- prop: 'ip'
- },
- {
- label: '鎽勫儚鏈哄姛鑳界被鍨�',
- align: 'center',
- prop: 'cameraFunType'
+ prop: 'name.showValue'
},
{
label: '璁惧鐘舵��',
align: 'center',
- prop: 'onState'
+ prop: 'sbzt.showValue'
},
{
- label: '鑱旂綉灞炴��',
+ label: 'Mac鍦板潃',
align: 'center',
- prop: 'netWorking'
+ prop: 'macdz.showValue'
+ },
+ {
+ label: 'IPV4/IPV6',
+ align: 'center',
+ prop: 'ip.showValue'
+ },
+ {
+ label: '鐩戞帶鐐逛綅绫诲瀷',
+ align: 'center',
+ prop: 'jkdwlx.showValue'
+ },
+ {
+ label: '鎽勫儚鏈哄姛鑳界被鍨�',
+ align: 'center',
+ prop: 'sxjgnlx.showValue'
+ },
+ {
+ label: '琛屾斂缂栫爜',
+ align: 'center',
+ prop: 'civilCode.showValue'
+ },
+ {
+ label: '缁忓害',
+ align: 'center',
+ prop: 'latitude.showValue'
+ },
+ {
+ label: '绾害',
+ align: 'center',
+ prop: 'longitude.showValue'
+ },
+ {
+ label: '鎽勫儚鏈洪噰闆嗗尯鍩�',
+ align: 'center',
+ prop: 'sxjcjqy.showValue'
},
],
card: [
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 5f8cb06..e3c0f39 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -58,8 +58,7 @@
</el-date-picker>
</div>
<div class="bottom_">
- <el-checkbox v-model="provinceTag">閲嶇偣鐐逛綅</el-checkbox>
- <el-checkbox v-model="importantTag">鐪佸巺</el-checkbox>
+ <el-checkbox v-model="provinceTag">鐪佸巺</el-checkbox>
<el-checkbox v-model="importantCommandImageTag">閲嶇偣鎸囨尌鍥惧儚</el-checkbox>
</div>
<div class="bottom_">
--
Gitblit v1.8.0