From 6140eb0f56b7adae1d4e41dbd4a1ac582dd17d9b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 11:23:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/resourceDemand/device/component/device-overview.vue | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/device-overview.vue b/src/views/CNAS/resourceDemand/device/component/device-overview.vue
index ae3e069..2efabd0 100644
--- a/src/views/CNAS/resourceDemand/device/component/device-overview.vue
+++ b/src/views/CNAS/resourceDemand/device/component/device-overview.vue
@@ -145,8 +145,8 @@
<template>
<div class="role_manage">
- <div>
- <el-form :model="entity" inline label-position="right" label-width="80px">
+ <div style="margin-top: 10px">
+ <el-form :model="entity" inline label-position="right">
<el-form-item label="鐘舵��:">
<el-select v-model="entity.deviceStatus" placeholder="鍏ㄩ儴" size="small" clearable>
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
@@ -164,24 +164,6 @@
@click="currentPage = 1, keyMap = {}, list = [], finishLoding = false, refreshTable()">鏌� 璇�</el-button>
</el-form-item>
</el-form>
- <!-- <div class="search_thing">
- <div class="search_label">鐘舵�侊細</div>
- <el-select v-model="entity.deviceStatus" placeholder="鍏ㄩ儴" size="small" clearable>
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </div>
- <div class="search_thing">
- <div class="search_label">璁惧鍚嶇О锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.deviceName"></el-input>
- </div>
- </div> -->
-
-
- <!-- <div class="search_thing" style="padding-left: 30px;">
- </div> -->
</div>
<div class="table" v-loading="loading">
<scroll-pagination @load="refreshTable()" :finishLoding="finishLoding" :list="list"
@@ -255,7 +237,6 @@
entity: {
deviceStatus: null,
deviceName: null,
- orderBy: { field: "id", order: "asc" }
},
options: [],
list: [],
@@ -298,8 +279,8 @@
...this.entity
}).then(res => {
if (res.code == 200) {
- this.total = res.data.body.total
- let list = res.data.body.records.map(m => {
+ this.total = res.data.total
+ let list = res.data.records.map(m => {
switch (m.deviceStatus) {
case 0:
// 姝ｅ父
--
Gitblit v1.9.3