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 | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/views/structural/premises/index.vue b/src/views/structural/premises/index.vue
index 8ff0e53..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>
@@ -67,9 +67,9 @@
placeholder="璇烽�夋嫨" size="small" style="width:100%" collapse-tags clearable></el-cascader>
</el-form-item>
<el-form-item label="鍗扮珷鍥剧墖" prop="address">
- <el-upload class="avatar-uploader" :action="action" :headers="headers" accept='image/jpg,image/jpeg,image/png'
- :show-file-list="false" :on-success="handleSuccess" :on-change="beforeUpload" ref="upload"
- :on-error="onError">
+ <el-upload class="avatar-uploader" :action="action" :headers="uploadHeader"
+ accept='image/jpg,image/jpeg,image/png' :show-file-list="false" :on-success="handleSuccess"
+ :on-change="beforeUpload" ref="upload" :on-error="onError">
<img v-if="dataForm.address" :src="javaApi + '/img/' + dataForm.address" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
@@ -94,20 +94,14 @@
upParameter
} from "@/api/structural/laboratoryScope";
import { getCertificationDetail } from "@/api/structural/laboratory";
-import { getToken } from "@/utils/auth";
export default {
components: {
limsTable
},
computed: {
- headers() {
- return {
- 'Authorization': "Bearer " + getToken()
- }
- },
action() {
- return this.javaApi
+ return this.javaApi + '/deviceScope/uploadFile'
}
},
data() {
@@ -129,9 +123,7 @@
{ label: '鍒涘缓鏃堕棿', prop: 'createTime' },
{
dataType: 'action',
- fixed: 'right',
label: '鎿嶄綔',
- width: '180px',
operation: [
{
name: '缂栬緫',
@@ -296,8 +288,6 @@
delParameter({ id: row.id }).then(res => {
this.$message.success('鍒犻櫎鎴愬姛')
this.refreshTable()
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
})
}).catch(() => { })
},
--
Gitblit v1.9.3