From 7c168bb4deb77ff22f178e1b8091446fde674e29 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 12 三月 2025 11:18:09 +0800
Subject: [PATCH] 设备搬迁-设备档案联调
---
src/api/cnas/resourceDemand/device.js | 14 +++++++-------
src/views/CNAS/resourceDemand/device/index.vue | 6 +++---
src/views/CNAS/resourceDemand/device/component/files.vue | 5 ++---
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 635890a..08b9d6d 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -660,7 +660,7 @@
//鏂板璁惧妗ｆ
export function addDocument(data) {
return request({
- url: "/deviceDocuments/addDocument",
+ url: "/documents/add",
method: "post",
data: data,
});
@@ -669,7 +669,7 @@
// 鑾峰彇鐩稿叧鏂囨。鏁版嵁鐨刟pi-鏇存柊
export function updateDocument(data) {
return request({
- url: "/deviceDocuments/updateDocument",
+ url: "/documents/updateDocument",
method: "post",
data: data,
});
@@ -678,7 +678,7 @@
//鍒犻櫎璁惧妗ｆ
export function deleteDocumentById(query) {
return request({
- url: "/deviceDocuments/deleteDocumentById",
+ url: "/documents/delete",
method: "delete",
params: query,
});
@@ -814,9 +814,9 @@
}
//鏌ヨ璁惧妗ｆ鍒楄〃
-export function getAllDocuments(query) {
+export function getListByDId(query) {
return request({
- url: `/deviceDocuments/getAllDocuments`,
+ url: '/documents/getListByDId',
method: "get",
params: query,
});
@@ -1283,10 +1283,10 @@
params: query,
});
}
-//璁惧棰勭害鎺ュ彛
+// 璁惧杩愯鎬昏-鏍规嵁id鑾峰彇璁惧鏁呴殰鏁版嵁
export function device(query) {
return request({
- url: "/api/device-faults/device",
+ url: "/deviceFaults/device",
method: "get",
params: query,
});
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index feabc51..1850918 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -470,11 +470,10 @@
updateDocument,
addDocument,
deleteDocumentById,
- getAllDocuments,
selectDeviceByCode,
upDeviceParameter,
exportDeviceFile,
- getInsProduction,
+ getInsProduction, getListByDId,
} from '@/api/cnas/resourceDemand/device.js'
import { selectUserCondition } from "@/api/system/user";
import {
@@ -719,7 +718,7 @@
},
// 鑾峰彇鐩稿叧鏂囨。鏁版嵁鐨刟pi
getPage() {
- getAllDocuments({ deviceId: this.clickNodeVal.value }).then(res => {
+ getListByDId({ id: this.clickNodeVal.value }).then(res => {
if (res.code == 200)
this.tableDataA = res.data
})
diff --git a/src/views/CNAS/resourceDemand/device/index.vue b/src/views/CNAS/resourceDemand/device/index.vue
index 8206ced..a12de51 100644
--- a/src/views/CNAS/resourceDemand/device/index.vue
+++ b/src/views/CNAS/resourceDemand/device/index.vue
@@ -47,7 +47,7 @@
<div v-if="!isShowAll" style="height: 100%;">
<el-tabs v-model="tabListActiveName" class="main_right" type="border-card" @tab-click="handleClick">
<el-tab-pane label="璁惧杩愯鎬昏" name="璁惧杩愯鎬昏">
- <operationOverview v-if="tabListActiveName == '璁惧杩愯鎬昏'" :clickNodeVal="clickNodeVal"/>
+ <operationOverview view v-if="tabListActiveName == '璁惧杩愯鎬昏'" :clickNodeVal="clickNodeVal"/>
</el-tab-pane>
<el-tab-pane label="璁惧妗ｆ" name="璁惧妗ｆ">
<files v-if="tabListActiveName == '璁惧妗ｆ'" :clickNodeVal="clickNodeVal" />
@@ -123,7 +123,7 @@
isShowAll: true,
deviceName: "", // 渚ц竟鏍忔悳绱�
loading: false,
- tabListActiveName: '璁惧妗ｆ',
+ tabListActiveName: '璁惧杩愯鎬昏',
menuListActiveName: '璁惧鎬昏',
list: [],
clickNodeVal: {}
@@ -200,7 +200,7 @@
.device-right {
background: #fff;
width: calc(100% - 250px);
- height: calc(100vh - 100px);
+ height: calc(100vh - 40px);
border-radius: 16px;
box-sizing: border-box;
padding: 10px;
--
Gitblit v1.9.3