From 195beac1c7d16783f67caf8d922fb2c373639cad Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 23 九月 2024 14:51:00 +0800
Subject: [PATCH] 修改了打不开详细页面
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 1 -
ruoyi-ui/src/views/device/index.vue | 17 +++++++++--------
ruoyi-ui/src/router/index.js | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index b08668b..d91409b 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -338,11 +338,11 @@
{
path: '/familymodel/Device',
component: Layout,
- name: 'ZfDevice',
+ // name: 'ZfDevice',
// permissions: [],
// hidden: true,
permissions: ['familymodel:device:info'],
- component: () => import('@/views/device/index'),
+ // component: () => import('@/views/device/index'),
children: [
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 350c7d4..d2f2101 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -318,7 +318,6 @@
this.btn = false;
this.isShow=false
}
-
let _this = this
if (id) {
this.loading = true;
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 731c75b..2ccf4ae 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -141,18 +141,18 @@
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
-
+
<el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
<el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
<el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
-
-
-
+
+
+
<right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
+
</el-row>
<!-- 搴忓彿銆佽澶囧悕绉般�佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
@@ -870,10 +870,10 @@
this.userOptions.push({label: element.oldName,value: element.userId})
})
})
-
-
+
+
let clanId = this.$store.state.user.clanId
-
+
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -1034,6 +1034,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ // alert(988)
this.$router.push("/familymodel/Device/equipmentInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1