From 7a4ff8881c150f910540f1ac270e090695ce460c Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期五, 12 一月 2024 22:42:54 +0800
Subject: [PATCH] update
---
src/container/Map/index.vue | 4 ++--
src/container/home/index.vue | 13 +++++++------
src/utils/ajax.js | 12 ++++++------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/container/Map/index.vue b/src/container/Map/index.vue
index 7cca229..e11e4fb 100644
--- a/src/container/Map/index.vue
+++ b/src/container/Map/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-01-05 22:26:22
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-12 20:23:25
+ * @LastEditTime: 2024-01-12 22:37:43
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/index.vue
-->
<template>
@@ -75,7 +75,7 @@
currentMap: [],
plantName: '',
mapList: [],
- status: 0, // 0 鏂板 1缂栬緫 2鏌ョ湅
+ status: 2, // 0 鏂板 1缂栬緫 2鏌ョ湅
}
},
methods: {
diff --git a/src/container/home/index.vue b/src/container/home/index.vue
index c1ca005..7876258 100644
--- a/src/container/home/index.vue
+++ b/src/container/home/index.vue
@@ -34,12 +34,12 @@
<span>
鎶ヨ〃鐢熸垚<i class="el-icon-caret-bottom"></i>
</span>
- <ul v-if="showSub">
+ <!-- <ul v-if="showSub">
<li>2鍘�</li>
<li>2鍘�</li>
<li>2鍘�</li>
<li>2鍘�</li>
- </ul>
+ </ul> -->
</li>
<li :class="activeId ==='6' ? 'active' : ''" @click="navigateTo('6')">鐝璁剧疆</li>
<li :class="activeId ==='7' ? 'active' : ''" @click="navigateTo('7')">宸ヤ欢淇℃伅</li>
@@ -50,8 +50,6 @@
<ul v-if="showSub">
<li @click="navigateTo('ledger')">鍙拌处</li>
<li @click="navigateTo('deviceType')">璁惧绫诲瀷绠＄悊</li>
- <li>2鍘�</li>
- <li>2鍘�</li>
</ul>
</li>
</ul>
@@ -105,8 +103,11 @@
}
if (['3','5','8'].includes(name)) {
this.activeId = name
- console.log(v)
- this.$router.push({name: routers[name],params: {id: v.id},query: {
+ let params = {}
+ if (v) {
+ params.id = v.id
+ }
+ this.$router.push({name: routers[name],params,query: {
...v
}})
this.$nextTick(() => {
diff --git a/src/utils/ajax.js b/src/utils/ajax.js
index bd8a441..47c823d 100644
--- a/src/utils/ajax.js
+++ b/src/utils/ajax.js
@@ -1,7 +1,7 @@
/*
* @Date: 2022-11-09 12:37:25
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-07 23:53:33
+ * @LastEditTime: 2024-01-12 22:39:31
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/utils/ajax.js
*/
import axios from 'axios'
@@ -54,11 +54,11 @@
*/
const status = response.status
if (status !== 200) {
- Message({
- message: '鏈嶅姟杩炴帴寮傚父锛岃绋嶅悗閲嶈瘯鎴栬仈绯荤鐞嗗憳',
- type: 'error',
- duration: 5 * 1000
- })
+ // Message({
+ // message: '鏈嶅姟杩炴帴寮傚父锛岃绋嶅悗閲嶈瘯鎴栬仈绯荤鐞嗗憳',
+ // type: 'error',
+ // duration: 5 * 1000
+ // })
return Promise.reject('error')
} else {
// const data = response.data || {}
--
Gitblit v1.9.3