From e8163f9d19299773cf4b29d881749dfda7b4ef3a Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 12 四月 2024 12:12:05 +0800
Subject: [PATCH] mrshi
---
admin/src/views/business/device.vue | 27 ++++++++++++++++-----------
admin/vue.config.js | 2 +-
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index db38236..701414d 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -14,6 +14,12 @@
<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>
@@ -34,6 +40,14 @@
<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
@@ -47,16 +61,6 @@
</template>
</el-table-column>
<el-table-column prop="no" label="璁惧鍙�"></el-table-column>
-<!-- <el-table-column-->
-<!-- v-if="containPermissions(['business:device:update'])"-->
-<!-- label="鎿嶄綔"-->
-<!-- min-width="120"-->
-<!-- fixed="right"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- <el-button type="text" @click="$refs.operaDeviceWindow.open('缂栬緫璁惧淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -87,7 +91,8 @@
searchForm: {
doorName: '',
regionPathName: '',
- isEntrance: ''
+ isEntrance: '',
+ online: ''
},
options: []
}
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 20eea8b..c856bf8 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -21,7 +21,7 @@
// target: 'http://218.23.218.228:8018/admin_interface',
// http://218.23.218.228:9912/admin_interface
// http://facepay.huasunsolar.com/admin_interface
- target: 'http://192.168.0.176:10028 ',
+ target: 'http://facepay.huasunsolar.com/admin_interface',
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
--
Gitblit v1.9.3