From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/structural/premises/index.vue | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/views/structural/premises/index.vue b/src/views/structural/premises/index.vue
index 0cb76e1..2b9b750 100644
--- a/src/views/structural/premises/index.vue
+++ b/src/views/structural/premises/index.vue
@@ -12,8 +12,8 @@
@keyup.enter.native="refreshTable"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
@@ -22,9 +22,8 @@
</div>
</div>
<div class="table">
- <lims-table :tableData="tableData" :column="column"
- :height="'calc(100vh - 250px)'" @pagination="pagination"
- :page="page" :tableLoading="tableLoading"></lims-table>
+ <lims-table :tableData="tableData" :column="column" :height="'calc(100vh - 250px)'" @pagination="pagination"
+ :page="page" :tableLoading="tableLoading"></lims-table>
</div>
<!-- 鏂板瀹為獙瀹�-->
<el-dialog :title="formTitle" :visible.sync="addDia" width="450px">
@@ -102,7 +101,7 @@
},
computed: {
action() {
- return this.javaApi
+ return this.javaApi + '/deviceScope/uploadFile'
}
},
data() {
@@ -124,9 +123,7 @@
{ label: '鍒涘缓鏃堕棿', prop: 'createTime' },
{
dataType: 'action',
- fixed: 'right',
label: '鎿嶄綔',
- width: '180px',
operation: [
{
name: '缂栬緫',
@@ -291,8 +288,6 @@
delParameter({ id: row.id }).then(res => {
this.$message.success('鍒犻櫎鎴愬姛')
this.refreshTable()
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
})
}).catch(() => { })
},
--
Gitblit v1.9.3