From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/business/deviceDianbiao.vue | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/deviceDianbiao.vue b/admin/src/views/business/deviceDianbiao.vue
index e6a91d5..85a37d0 100644
--- a/admin/src/views/business/deviceDianbiao.vue
+++ b/admin/src/views/business/deviceDianbiao.vue
@@ -6,7 +6,7 @@
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item title="鏍囪瘑绗�" prop="no">
- <el-input v-model="searchForm.no" placeholder="璇疯緭鍏ヨ澶囨爣璇嗙" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.no" placeholder="璇疯緭鍏ヨ澶囧湴鍧�鍩�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item title="璁惧鍙�" prop="doorNo">
<el-input v-model="searchForm.doorNo" placeholder="璇疯緭鍏ヨ澶囧彿" @keypress.enter.native="search"></el-input>
@@ -95,9 +95,7 @@
<el-date-picker type="datetime" v-model="form.cmdDate" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="璇烽�夋嫨鏈夋晥鏃堕棿" />
</el-form-item>
-<!--
- <p class="tip-warn" style="width: 100%;"><i class="el-icon-warning"></i></p>
--->
+ <!-- <p class="tip-warn" style="width: 100%;"><i class="el-icon-warning"></i></p> -->
</el-form>
<template v-slot:footer >
<el-button @click="sendAction(0)" type="primary" v-if="form.status === 1" :loading="isWorkSending">纭寮�闂�</el-button>
@@ -133,7 +131,7 @@
form: {
id: '',
status: null,
- name:null,
+ name: null,
cmdDate: null
},
visibleSend: false,
--
Gitblit v1.9.3