From d65e6f9c8cb7c9218801318f8cdd1a1e3a2f2408 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 13:55:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/carEvent.vue | 4 +-
admin/src/views/business/device.vue | 76 --------------------------------------
h5/utils/config.js | 4 +-
h5/pages/login/login.vue | 2
h5/utils/service.js | 2
admin/src/views/operation/danger/record.vue | 2
6 files changed, 7 insertions(+), 83 deletions(-)
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index 5460f17..0b5cd5d 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -81,7 +81,7 @@
<span v-if="row.inoutType === 1">绂诲洯</span>
</template>
</el-table-column>
- <!-- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
+ <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
<template slot-scope="{ row }">
<div v-if="row.platePicUrl != null">
<el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
@@ -97,7 +97,7 @@
</el-image>
</div>
</template>
- </el-table-column> -->
+ </el-table-column>
<el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index 1c1ff3c..987f067 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -1,80 +1,4 @@
<template>
- <TableLayout :permissions="['business:device:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="闂ㄧ鐐瑰悕绉�" prop="doorName">
- <el-input v-model="searchForm.doorName" placeholder="璇疯緭鍏ラ棬绂佺偣鍚嶇О" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍖哄煙鍚嶇О" prop="regionPathName">
- <el-input v-model="searchForm.regionPathName" placeholder="璇疯緭鍏ュ尯鍩熷悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏄惁鍥尯鍏ュ彛" prop="isEntrance">
- <el-select v-model="searchForm.isEntrance" placeholder="璇烽�夋嫨">
- <el-option label="鏄�" value="1"></el-option>
- <el-option label="鍚�" value="0"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍦ㄧ嚎鐘舵��" prop="online">
- <el-select v-model="searchForm.online" placeholder="璇烽�夋嫨" clearable>
- <el-option label="绂荤嚎" value="0"></el-option>
- <el-option label="鍦ㄧ嚎" value="1"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar">
- <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
- <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
- <el-table-column prop="doorName" label="闂ㄧ鐐瑰悕绉�"></el-table-column>
- <el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О"></el-table-column>
-<!--
- <el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�"></el-table-column>
--->
- <el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
- <el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
- <template slot-scope="{row}">
- <span v-if="row.online == 0">绂荤嚎</span>
- <span v-if="row.online == 1">鍦ㄧ嚎</span>
- </template>
- </el-table-column>
- <el-table-column prop="ip" label="璁惧ip"></el-table-column>
- <el-table-column prop="port" label="璁惧绔彛"></el-table-column>
- <el-table-column label="鏄惁鍥尯鍏ュ彛">
- <template slot-scope="{row}">
- <el-switch
- @change="changeManufature($event, row)"
- v-model="row.isEntrance"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="1"
- :inactive-value="0">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column prop="no" width="200px" label="璁惧鍙�"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
-<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
- </TableLayout>
<TableLayout :permissions="['business:device:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<div ref="QueryFormRef" slot="search-form">
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index 5c45c1b..226dfeb 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -77,7 +77,7 @@
</template>
</el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column label="鎿嶄綔" min-width="180" fixed="right">
+ <!-- <el-table-column label="鎿嶄綔" min-width="180" fixed="right"> -->
<el-table-column prop="dealTime" label="澶勭悊鏃堕棿" min-width="150px"></el-table-column>
<!--
<el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index 53074fa..cac61df 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -41,7 +41,7 @@
export default {
data() {
return {
- code: '11'
+ code: ''
}
},
onLoad(option) {
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 08884a3..05ff784 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-export const baseUrl = 'zhyq_interface/'
+// export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
diff --git a/h5/utils/service.js b/h5/utils/service.js
index 4a85322..55d60a4 100644
--- a/h5/utils/service.js
+++ b/h5/utils/service.js
@@ -33,7 +33,7 @@
icon: "none",
duration: 2000
})
- })
+ },500)
if (data.code === 500) {
uni.showToast({
'title': '鏈嶅姟鍣ㄥ紓甯�',icon:'none'
--
Gitblit v1.9.3