From 8dcb0edcc2ceaa244501e7ed0c4f363ab4f3a428 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 03 四月 2026 15:29:04 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/api/business/ywGateway.js | 18 +++
admin/src/components/business/DeviceGatewayWindow.vue | 101 ++++++++++++++++++++
admin/.env.production | 2
admin/src/components/business/electricityMeter.vue | 58 +++++++++++
admin/src/views/business/deviceGateway.vue | 100 ++++++++++++++++++++
admin/.env.development | 4
6 files changed, 283 insertions(+), 0 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 59e70de..4e50306 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,6 +2,10 @@
NODE_ENV = 'development'
# 椤圭洰涓婁笅鏂囪矾寰�
VUE_APP_CONTEXT_PATH = './'
+
+#VUE_APP_API_URL = 'http://localhost:10010'
+
VUE_APP_API_URL = 'http://192.168.1.44:10010'
+
#VUE_APP_API_URL = 'https://zhcg.fnwtzx.com/gateway_interface'
diff --git a/admin/.env.production b/admin/.env.production
index 7eb08c5..19d9a2b 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,4 +1,6 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
+# VUE_APP_API_URL = 'https://dmtest.ahapp.net/gateway_interface'
+VUE_APP_API_URL = 'https://zhcg.fnwtzx.com/gateway_interface/doc.html'
VUE_APP_API_URL = 'https://zhcg.fnwtzx.com/gateway_interface'
diff --git a/admin/src/api/business/ywGateway.js b/admin/src/api/business/ywGateway.js
new file mode 100644
index 0000000..ac09e78
--- /dev/null
+++ b/admin/src/api/business/ywGateway.js
@@ -0,0 +1,18 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywGateway/page', data)
+}
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywGateway/create', data)
+}
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywGateway/updateById', data)
+}
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/ywGateway/delete/${id}`)
+}
\ No newline at end of file
diff --git a/admin/src/components/business/DeviceGatewayWindow.vue b/admin/src/components/business/DeviceGatewayWindow.vue
new file mode 100644
index 0000000..eaba155
--- /dev/null
+++ b/admin/src/components/business/DeviceGatewayWindow.vue
@@ -0,0 +1,101 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ :visible.sync="visible"
+ width="65%"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="椤圭洰鍚嶇О" prop="name">
+ <el-select v-model="form.projectId" placeholder="璇烽�夋嫨椤圭洰鍚嶇О">
+ <el-option
+ v-for="item in projectList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缃戝叧鍚嶇О" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ョ綉鍏冲悕绉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="缃戝叧鍨嬪彿" prop="gatewayModel">
+ <el-input v-model="form.gatewayModel" placeholder="璇疯緭鍏ョ綉鍏冲瀷鍙�" v-trim/>
+ </el-form-item>
+ <el-form-item label="缃戝叧璁惧鍙�" prop="gatewayCode">
+ <el-input v-model="form.gatewayCode" placeholder="璇疯緭鍏ョ綉鍏宠澶囧彿" v-trim/>
+ </el-form-item>
+ </el-form>
+ </GlobalWindow>
+</template>
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { getProjectList } from '@/api/project/ywProject'
+export default {
+ name: 'DeviceGatewayWindow ',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ projectId: '',
+ name: '',
+ gatewayModel: '',
+ gatewayCode: ''
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ name: [
+ { required: true, message: '璇疯緭鍏ヨ澶囧悕绉�', trigger: 'blur' }
+ ],
+ projectId: [
+ { required: true, message: '璇烽�夋嫨椤圭洰鍚嶇О', trigger: 'change' }
+ ],
+ gatewayModel: [
+ { required: true, message: '璇疯緭鍏ョ綉鍏冲瀷鍙�', trigger: 'blur' }
+ ],
+ gatewayCode: [
+ { required: true, message: '璇疯緭鍏ョ綉鍏宠澶囧彿', trigger: 'blur' }
+ ]
+ },
+ projectList: []
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/ywGateway',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, target) {
+ this.title = title
+ this.getProject()
+ this.visible = true
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(async () => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ })
+ },
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res || []
+ })
+ },
+ }
+}
+</script>
diff --git a/admin/src/components/business/electricityMeter.vue b/admin/src/components/business/electricityMeter.vue
new file mode 100644
index 0000000..55a6b4f
--- /dev/null
+++ b/admin/src/components/business/electricityMeter.vue
@@ -0,0 +1,58 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ :visible.sync="visible"
+ :showConfirm="false"
+ width="65%"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-table
+ :data="tableData"
+ stripe
+ style="width: 100%">
+ <el-table-column
+ prop="date"
+ label="琛ㄥ彿">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="琛ㄥ悕绉�">
+ </el-table-column>
+ <el-table-column
+ prop="浠樿垂绫诲瀷"
+ label="浠樿垂绫诲瀷">
+ </el-table-column>
+ <el-table-column
+ prop="璁惧缁戝畾鐘舵��"
+ label="璁惧缁戝畾鐘舵��">
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔">
+ <template slot-scope="{row}">
+ <el-button type="text">瑙ｇ粦</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </GlobalWindow>
+</template>
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+export default {
+ name: 'electricityMeter',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ tableData: []
+ }
+ },
+ created () {
+
+ },
+ methods: {
+
+ }
+}
+</script>
diff --git a/admin/src/views/business/deviceGateway.vue b/admin/src/views/business/deviceGateway.vue
new file mode 100644
index 0000000..287e274
--- /dev/null
+++ b/admin/src/views/business/deviceGateway.vue
@@ -0,0 +1,100 @@
+<template>
+ <TableLayout :permissions="['business:device:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item title="缃戝叧鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ綉鍏冲悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item title="椤圭洰鍚嶇О" prop="projectId">
+ <el-select v-model="searchForm.projectId" placeholder="璇烽�夋嫨椤圭洰鍚嶇О">
+ <el-option
+ v-for="item in projectList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </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" v-permissions="['business:device:create', 'business:device:delete']">
+ <li><el-button type="primary" @click="$refs.operaDeviceGateway.open('鏂板缓缃戝叧')" icon="el-icon-plus" v-permissions="['business:device:create']">娣诲姞缃戝叧</el-button></li>
+ </ul>
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe >
+ <el-table-column prop="name" label="缃戝叧鍚嶇О" fixed min-width="150" align="center"></el-table-column>
+ <el-table-column prop="gatewayModel" label="缃戝叧鍨嬪彿" min-width="100" align="center" ></el-table-column>
+ <el-table-column prop="gatewayCode" label="缃戝叧璁惧鍙�" min-width="120" align="center" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="lastHeartbeatTime" label="鏈�鍚庡績璺虫椂闂�" align="center" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ min-width="280"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaElectricityMeter.open('鏌ョ湅缁戝畾鐢佃〃', row)">宸茬粦鐢佃〃</el-button>
+ <el-button type="text" @click="$refs.operaDeviceGateway.open('缂栬緫缃戝叧', row)">缂栬緫</el-button>
+ <el-button type="text" class="red" @click="deleteById(row)" v-permissions="['business:device:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <DeviceGatewayWindow ref="operaDeviceGateway" @success="handlePageChange"/>
+ <!-- 瑙ｇ粦鐢佃〃 -->
+ <ElectricityMeter ref="operaElectricityMeter" @success="handlePageChange"/>
+ </TableLayout>
+</template>
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import { getProjectList } from '@/api/project/ywProject'
+import DeviceGatewayWindow from '@/components/business/DeviceGatewayWindow'
+import ElectricityMeter from '@/components/business/electricityMeter'
+export default {
+ name: 'deviceGateway',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, DeviceGatewayWindow, ElectricityMeter },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ projectId: '',
+ name: ''
+ },
+ projectList: []
+ }
+ },
+ created () {
+ this.config({
+ module: '缃戝叧绠＄悊',
+ api: '/business/ywGateway',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ this.getProject()
+ },
+ methods: {
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res || []
+ })
+ },
+ }
+}
+</script>
--
Gitblit v1.9.3