From ffba2c405154eb6de9be00d9b5632e8a33ffc366 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 30 十月 2025 18:09:26 +0800
Subject: [PATCH] 改bug
---
admin/src/views/business/jkCustomer.vue | 5 ++
admin/src/components/business/OperaJkCabinetWindow.vue | 6 +-
admin/src/components/business/OperaJkLineImportWindow.vue | 7 ++-
admin/src/components/business/OperaJkKeysWindow.vue | 8 ++--
admin/src/components/business/OperaInternalCompanyWindow.vue | 3 +
admin/.env.production | 4 +-
admin/src/views/business/jkKeys.vue | 6 ++
admin/src/components/business/OperaJkSketchImportWindow.vue | 5 ++
admin/src/views/business/jkCabinet.vue | 10 ++--
admin/src/views/business/internalCompany.vue | 3 +
admin/src/components/business/cabinetDetails.vue | 3 +
admin/src/views/business/jkLine.vue | 5 +-
admin/.env.development | 4 +-
13 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 3747781..05e081e 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -3,9 +3,9 @@
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-VUE_APP_API_URL = 'http://192.168.1.45:10010'
+# VUE_APP_API_URL = 'http://192.168.1.45:10010'
-# VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
# VUE_APP_API_URL = 'http://localhost:10010'
diff --git a/admin/.env.production b/admin/.env.production
index ebe0cf3..e85e66f 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,7 +1,7 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-# VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
-VUE_APP_API_URL = 'http://10.49.39.23/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
+# VUE_APP_API_URL = 'http://10.49.39.23/system_gateway'
VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
diff --git a/admin/src/components/business/OperaInternalCompanyWindow.vue b/admin/src/components/business/OperaInternalCompanyWindow.vue
index a6f2673..6ff4b28 100644
--- a/admin/src/components/business/OperaInternalCompanyWindow.vue
+++ b/admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -19,7 +19,8 @@
<el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
</el-form-item>
<el-form-item label="缁勭粐绫诲瀷" prop="type" v-if="(editType === 'edit' && parentId) || (editType === 'add')" >
- <el-radio-group v-model="form.type" :disabled="(editType === 'edit') || (!!(editType === 'add' && parentId))">
+<!-- :disabled="(editType === 'edit') || (!!(editType === 'add' && parentId))"-->
+ <el-radio-group v-model="form.type">
<el-radio :label="0">鐩稿叧鏂圭粍缁�</el-radio>
<el-radio :label="1">鍐呴儴缁勭粐</el-radio>
</el-radio-group>
diff --git a/admin/src/components/business/OperaJkCabinetWindow.vue b/admin/src/components/business/OperaJkCabinetWindow.vue
index 4d2e072..19370db 100644
--- a/admin/src/components/business/OperaJkCabinetWindow.vue
+++ b/admin/src/components/business/OperaJkCabinetWindow.vue
@@ -102,11 +102,11 @@
</el-form-item>
<el-form-item label="鍓嶇紑" prop="noPrefix" v-if="form.noType === 1">
<div style="width: 100%; display: flex; align-items: center;">
- <el-input style="flex: 1;" v-model="form.noPrefix" placeholder="璇疯緭鍏ユ暟瀛楁垨瀛楁瘝" v-trim/>
+ <el-input style="flex: 1;" v-model="form.noPrefix" :disabled="form.id ? true : false" placeholder="璇疯緭鍏ユ暟瀛楁垨瀛楁瘝" v-trim/>
<span style="margin: 0 20px;">浣嶆暟</span>
- <el-input style="flex: 1;" v-model="form.noLength" placeholder="璇疯緭鍏ユ暟瀛�" v-trim/>
+ <el-input style="flex: 1;" v-model="form.noLength" :disabled="form.id ? true : false" placeholder="璇疯緭鍏ユ暟瀛�" v-trim/>
<span style="margin: 0 20px;">璧峰缂栧彿</span>
- <el-input style="flex: 1;" v-model="form.noIndex" placeholder="璇疯緭鍏ユ暟瀛�" v-trim/>
+ <el-input style="flex: 1;" v-model="form.noIndex" :disabled="form.id ? true : false" placeholder="璇疯緭鍏ユ暟瀛�" v-trim/>
</div>
</el-form-item>
<el-form-item label="鎺掑垪椤哄簭" prop="sortType" v-if="form.noType === 1">
diff --git a/admin/src/components/business/OperaJkKeysWindow.vue b/admin/src/components/business/OperaJkKeysWindow.vue
index dd81ab1..d6c444c 100644
--- a/admin/src/components/business/OperaJkKeysWindow.vue
+++ b/admin/src/components/business/OperaJkKeysWindow.vue
@@ -20,8 +20,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="RFID鏍囩" prop="rfidLable">
- <el-input v-model="form.rfidLable" placeholder="璇疯緭鍏FID鏍囩" v-trim/>
+ <el-form-item label="RFID鏍囩" prop="rfidCode">
+ <el-input v-model="form.rfidCode" placeholder="璇疯緭鍏FID鏍囩" v-trim/>
</el-form-item>
<el-form-item label="棰嗗彇瑙勫垯" prop="roleType">
<el-radio-group v-model="form.roleType">
@@ -48,7 +48,7 @@
id: null,
code: '',
carId: '',
- rfidLable: '',
+ rfidCode: '',
roleType: 0
},
// 楠岃瘉瑙勫垯
@@ -59,7 +59,7 @@
carId: [
{ required: true, message: '璇烽�夋嫨鎵�灞炶溅杈�', trigger: 'blur' }
],
- rfidLable: [
+ rfidCode: [
{ required: true, message: '璇疯緭鍏FID鏍囩', trigger: 'blur' }
],
roleType: [
diff --git a/admin/src/components/business/OperaJkLineImportWindow.vue b/admin/src/components/business/OperaJkLineImportWindow.vue
index c8f72f8..d9efbc3 100644
--- a/admin/src/components/business/OperaJkLineImportWindow.vue
+++ b/admin/src/components/business/OperaJkLineImportWindow.vue
@@ -11,7 +11,7 @@
<p class="tip-warn"><i class="el-icon-warning"></i>瀵煎叆璇存槑锛�<br>
1.璇峰厛涓嬭浇鏂囦欢妯℃澘锛屽苟鎸夌収妯℃澘瑕佸幓濉啓琛ㄦ牸鍐呭;<br>
</p>
- <el-form class="demo-form-inline" >
+ <el-form class="demo-form-inline" v-loading="loading">
<el-form-item label="绾胯矾淇℃伅" required>
<div style="width: 100%;display: flex;align-items: center;">
<el-button type="primary" @click="clickRef">鐐瑰嚮涓婁紶</el-button>
@@ -38,7 +38,8 @@
data () {
return {
importing:false,
- fileName: ''
+ fileName: '',
+ loading: false,
}
},
methods: {
@@ -56,6 +57,7 @@
this.$refs.fileExcel.click()
},
result (e) {
+ this.loading = true
const data = new FormData()
data.append('file', e.target.files[0])
importExcel(data)
@@ -69,6 +71,7 @@
this.fileName = ''
})
.finally(() => {
+ this.loading = false
this.$refs.fileExcel.value = null
})
}
diff --git a/admin/src/components/business/OperaJkSketchImportWindow.vue b/admin/src/components/business/OperaJkSketchImportWindow.vue
index 1c307d5..8faec5a 100644
--- a/admin/src/components/business/OperaJkSketchImportWindow.vue
+++ b/admin/src/components/business/OperaJkSketchImportWindow.vue
@@ -13,7 +13,7 @@
2.姣忔瀵煎叆閿�鍞鍗曡〃绀哄嵆鍒犻櫎涔嬪墠瀵煎叆姝ゆ鐩稿簲鏃ユ湡鐨勮鍗曡褰曪紝浠ユ娆″鍏ョ殑鏁版嵁涓轰富;<br>
</p>
<el-form class="demo-form-inline" :model="form" ref="form" :rules="rules">
- <el-form-item label="閫佽揣鏃ユ湡" prop="dateInfo" >
+ <el-form-item label="閫佽揣鏃ユ湡" prop="dateInfo" v-loading="loading">
<el-date-picker v-model="form.dateInfo" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ棩鏈�" />
</el-form-item>
<el-form-item label="璁㈠崟淇℃伅" required>
@@ -42,6 +42,7 @@
data () {
return {
importing: false,
+ loading: false,
fileName: '',
form: {
dateInfo: null
@@ -71,6 +72,7 @@
})
},
result (e) {
+ this.loading = true
const data = new FormData()
data.append('dateInfo', this.form.dateInfo)
data.append('file', e.target.files[0])
@@ -85,6 +87,7 @@
this.fileName = ''
})
.finally(() => {
+ this.loading = false
this.$refs.fileExcel.value = null
})
}
diff --git a/admin/src/components/business/cabinetDetails.vue b/admin/src/components/business/cabinetDetails.vue
index f1bb5d4..e55f3af 100644
--- a/admin/src/components/business/cabinetDetails.vue
+++ b/admin/src/components/business/cabinetDetails.vue
@@ -179,6 +179,7 @@
unBindKeys(this.ids)
.then(res => {
this.getList()
+ this.getKeysAll()
})
}).catch(() => {
@@ -207,7 +208,7 @@
page: 1,
model: {
cabinetId: this.id,
- keyId: this.searchForm.keyId,
+ keyCode: this.searchForm.keyCode,
status: this.searchForm.status,
bindStatus: this.searchForm.bindStatus,
workingStatus: this.searchForm.workingStatus
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 4e8edc9..6bfea48 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -45,9 +45,10 @@
<el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
<el-table-column label="鎿嶄綔" width="230" fixed="right">
<template slot-scope="{row}">
+<!-- v-if="row.type ==0"-->
<el-button type="text"
@click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', { id: row.parentId, name: row.parentName, type: row.parentType, companyPath: row.parentCompanyPath }, row, 'edit')"
- icon="el-icon-edit" v-permissions="['business:company:update']" v-if="row.type ==0">缂栬緫</el-button>
+ icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
<el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', row, null, 'add')"
icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
<el-button type="text" @click="deleteById(row)" style="color: red" icon="el-icon-delete"
diff --git a/admin/src/views/business/jkCabinet.vue b/admin/src/views/business/jkCabinet.vue
index e2182e2..8383506 100644
--- a/admin/src/views/business/jkCabinet.vue
+++ b/admin/src/views/business/jkCabinet.vue
@@ -8,8 +8,8 @@
<el-form-item label="璁惧鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヨ澶囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="杩愯鐘舵��" prop="rumStatus">
- <el-select v-model="searchForm.rumStatus" placeholder="璇烽�夋嫨" @change="search">
+ <el-form-item label="杩愯鐘舵��" prop="runStatus">
+ <el-select v-model="searchForm.runStatus" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
<el-option label="鍦ㄧ嚎" :value="0"></el-option>
<el-option label="绂荤嚎" :value="1"></el-option>
@@ -18,8 +18,8 @@
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="鍚敤" :value="1"></el-option>
- <el-option label="绂佺敤" :value="0"></el-option>
+ <el-option label="鍚敤" :value="0"></el-option>
+ <el-option label="绂佺敤" :value="1"></el-option>
</el-select>
</el-form-item>
<section>
@@ -116,7 +116,7 @@
code: '',
name: '',
status: '',
- rumStatus: ''
+ runStatus: ''
},
form: null
}
diff --git a/admin/src/views/business/jkCustomer.vue b/admin/src/views/business/jkCustomer.vue
index 3e63429..eb890d6 100644
--- a/admin/src/views/business/jkCustomer.vue
+++ b/admin/src/views/business/jkCustomer.vue
@@ -144,6 +144,11 @@
this.loadLines()
},
methods: {
+ reset() {
+ this.lineList = []
+ this.$refs.searchForm.resetFields()
+ this.search()
+ },
loadCategory () {
fetchCateList({
type: 4
diff --git a/admin/src/views/business/jkKeys.vue b/admin/src/views/business/jkKeys.vue
index 6e83a1f..3478e40 100644
--- a/admin/src/views/business/jkKeys.vue
+++ b/admin/src/views/business/jkKeys.vue
@@ -45,7 +45,11 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="code" label="閽ュ寵缂栧彿" min-width="100px"></el-table-column>
<el-table-column prop="carCode" label="鎵�灞炶溅杈�" min-width="100px"></el-table-column>
- <el-table-column prop="rfidLable" label="RFID鏍囩" min-width="100px"></el-table-column>
+ <el-table-column prop="rfidLable" label="RFID鏍囩" min-width="150px">
+ <template slot-scope="{row}">
+ <span v-if="row.rfidCode">{{row.rfidCode}} ({{row.rfidLable}})</span>
+ </template>
+ </el-table-column>
<el-table-column prop="cabinetName" label="缁戝畾閽ュ寵鏌�" min-width="100px"></el-table-column>
<el-table-column prop="gridCode" label="瀛樻斁浣嶇疆" min-width="100px"></el-table-column>
<el-table-column label="缁戝畾鐘舵��" min-width="100px">
diff --git a/admin/src/views/business/jkLine.vue b/admin/src/views/business/jkLine.vue
index 256926e..1bbc62b 100644
--- a/admin/src/views/business/jkLine.vue
+++ b/admin/src/views/business/jkLine.vue
@@ -11,7 +11,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="杩愰�佽溅杈�" prop="carId">
+ <el-form-item label="杩愰�佽溅杈�" prop="carCode">
<el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ繍閫佽溅杈�" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="搴忓彿" prop="code">
@@ -31,8 +31,7 @@
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
-
- :height="tableHeightNew"
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
--
Gitblit v1.9.3