From bf45ba7501fd4619431108a561972f1a54776228 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 11 三月 2026 11:20:32 +0800
Subject: [PATCH] 新增智能电表、空调管理
---
admin/src/views/business/deviceDianbiao.vue | 6 -
/dev/null | 139 ----------------------------------
admin/src/views/roomStatus/index.vue | 2
admin/src/views/contract/components/terminateLease.vue | 6
admin/src/api/business/device.js | 36 ---------
5 files changed, 6 insertions(+), 183 deletions(-)
diff --git a/admin/src/api/business/device.js b/admin/src/api/business/device.js
index 09d3528..207ca0b 100644
--- a/admin/src/api/business/device.js
+++ b/admin/src/api/business/device.js
@@ -12,13 +12,9 @@
return request.post('/visitsAdmin/cloudService/business/hksync/syncDevices', data)
}
-
// 鑾峰彇闂ㄧ闆嗗悎-鎻愪緵缁欓棬绂佺粍
export function getList (data) {
return request.post('/visitsAdmin/cloudService/business/device/getList', data)
-}
-export function allList (data) {
- return request.post('/visitsAdmin/cloudService/business/device/list', data)
}
export function getDeviceRoleList (data) {
return request.post('/visitsAdmin/cloudService/business/deviceRole/list', data)
@@ -28,44 +24,12 @@
export function updateById (data) {
return request.post('/visitsAdmin/cloudService/business/device/updateById', data)
}
-export function create (data) {
- return request.post('/visitsAdmin/cloudService/business/device/create', data)
-}
-export function dianbiaoData(data) {
- return request.post('/visitsAdmin/cloudService/business/device/dianbiaoData', data)
-}
// 淇敼鏄惁闂ㄧ鍏ュ彛
export function updateEntranceById (data) {
return request.post('/visitsAdmin/cloudService/business/device/updateEntranceById', data)
}
-export function updateUsedById (data) {
- return request.post('/visitsAdmin/cloudService/business/device/updateUsedById', data)
-}
-export function duanluqiCmd (data) {
- return request.post('/visitsAdmin/cloudService/business/device/duanluqiCmd', data)
-}
-export function dianbaoCmd (data) {
- return request.post('/visitsAdmin/cloudService/business/device/dianbaoCmd', data)
-}
// 鍙戠敓led灞忓唴瀹�
export function setLedContent (data) {
return request.post('/visitsAdmin/cloudService/business/hksync/setLedContent', data)
-}
-export function sendBobao (data) {
- return request.post('/visitsAdmin/cloudService/business/hksync/sendBobao', data)
-}
-
-// 鍒犻櫎
-export function deleteById (id) {
- return request.get(`/visitsAdmin/cloudService/business/device/delete/${id}`)
-}
-
-// 鎵归噺鍒犻櫎
-export function deleteByIdInBatch (ids) {
- return request.get('/visitsAdmin/cloudService/business/device/delete/batch', {
- params: {
- ids
- }
- })
}
diff --git a/admin/src/views/business/deviceDianbiao.vue b/admin/src/views/business/deviceDianbiao.vue
index e6a91d5..06316f6 100644
--- a/admin/src/views/business/deviceDianbiao.vue
+++ b/admin/src/views/business/deviceDianbiao.vue
@@ -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,
diff --git a/admin/src/views/business/platformBroadcastLog.vue b/admin/src/views/business/platformBroadcastLog.vue
deleted file mode 100644
index 14c7504..0000000
--- a/admin/src/views/business/platformBroadcastLog.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
- <TableLayout :permissions="['business:platformbroadcastlog:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <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="content">
- <el-input v-model="searchForm.content" placeholder="璇疯緭鍏ュ唴瀹�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="personType">
- <el-select v-model="searchForm.deviceType" placeholder="璇烽�夋嫨璁惧绫诲瀷">
- <el-option label="骞挎挱" value="0"></el-option>
- <el-option label="LED" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="eventType">
- <el-select v-model="searchForm.hkStatus" placeholder="璇烽�夋嫨涓嬪彂鐘舵��">
- <el-option label="寰呬笅鍙�" value="0"></el-option>
- <el-option label="涓嬪彂涓�" value="1"></el-option>
- <el-option label="涓嬪彂鎴愬姛" value="2"></el-option>
- <el-option label="涓嬪彂澶辫触" value="3"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="eventType">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <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:platformbroadcastlog:exportExcel']">
-<!--
- <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformbroadcastlog:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
--->
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="deviceType" label="璁惧绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.deviceType == 0">骞挎挱</span>
- <span v-if="row.deviceType == 1">LED</span>
- </template>
- </el-table-column>
- <el-table-column prop="hkStatus" label="涓嬪彂鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.hkStatus == 0" style="color: #0c6ce3">寰呬笅鍙�</span>
- <span v-if="row.hkStatus == 1" style="color: #0c6ce3">涓嬪彂涓�</span>
- <span v-if="row.hkStatus == 2" style="color: green">涓嬪彂鎴愬姛</span>
- <span v-if="row.hkStatus == 3" style="color: red">涓嬪彂澶辫触</span>
- </template>
- </el-table-column>
- <el-table-column prop="name" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="info" label="鍐呭" min-width="100px"></el-table-column>
- <el-table-column prop="ids" label="璁惧缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
-</template>
-
-<script>
-import BaseTable from '@/components/base/BaseTable'
-import TableLayout from '@/layouts/TableLayout'
-import Pagination from '@/components/common/Pagination'
-import { timeForMat } from '@/utils/util'
-export default {
- name: 'DeviceEvent',
- extends: BaseTable,
- components: { TableLayout, Pagination },
- data () {
- return {
- // 鎼滅储
- searchForm: {
- name: '',
- info: '',
- deviceType: '',
- hkStatus: '',
- startTime: '',
- endTime: '',
- radio: 0
- },
- time: []
- }
- },
- created () {
- this.config({
- module: 'LED骞挎挱鎾斁璁板綍',
- api: '/business/platformBroadcastLog',
- 'field.id': 'id',
- 'field.main': 'id'
- })
- this.changeRadio('0')
- },
- methods: {
- changeRadio (e) {
- if (e === '0') {
- this.searchForm.startTime = timeForMat(0)[0]
- this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
- } else if (e === '1') {
- this.searchForm.startTime = timeForMat(6)[0]
- this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
- } else if (e === '2') {
- this.searchForm.startTime = timeForMat(29)[0]
- this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
- }
- this.search()
- },
- seleTime (e) {
- this.searchForm.startTime = e[0]
- this.searchForm.endTime = e[1]
- this.searchForm.radio = null
- this.search()
- },
- reset () {
- this.$refs.searchForm.resetFields()
- this.time = []
- this.searchForm.radio = '0'
- this.changeRadio('0')
- this.search()
- }
- }
-}
-</script>
diff --git a/admin/src/views/business/platformEvent.vue b/admin/src/views/business/platformEvent.vue
deleted file mode 100644
index 193fbf5..0000000
--- a/admin/src/views/business/platformEvent.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<template>
- <TableLayout :permissions="['business:platformevent:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="platformName">
- <el-input v-model="searchForm.platformName" placeholder="璇疯緭鍏ユ湀鍙板悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="channelName">
- <el-input v-model="searchForm.channelName" placeholder="璇疯緭鍏ョ洃鎺х偣鍚嶇О" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="plateNo">
- <el-input v-model="searchForm.plateNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="eventType">
- <el-select v-model="searchForm.motionStatus" placeholder="璇烽�夋嫨杩涘嚭绫诲瀷">
- <el-option label="绂诲紑" value="leave"></el-option>
- <el-option label="杩涘叆" value="enter"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="platformName" label="鏈堝彴鍚嶇О" min-width="150px"></el-table-column>
- <el-table-column prop="channelName" label="鐩戞帶鐐瑰悕绉�" min-width="150px"></el-table-column>
- <el-table-column prop="plateNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column label="杩涘嚭绫诲瀷" min-width="90px">
- <template slot-scope="{row}">
- <span v-if="row.motionStatus == 'enter'">杩涘叆</span>
- <span v-if="row.motionStatus == 'leave'">绂诲紑</span>
- <span v-if="row.motionStatus != 'leave' && row.motionStatus != 'enter'">{{ row.motionStatus }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鍓嶅悗鏍囪瘑" min-width="90px">
- <template slot-scope="{row}">
- <span v-if="row.stockStatus == 'rear'">杞﹀熬</span>
- <span v-if="row.stockStatus == 'front'">杞﹀ご</span>
- <span v-if="row.stockStatus != 'rear' && row.stockStatus != 'front'">{{ row.stockStatus }}</span>
- </template>
- </el-table-column>
- <el-table-column label="杞﹂棬鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.vehicleDoorStatus == 'open'">寮�闂�</span>
- <span v-if="row.vehicleDoorStatus == 'close'">鍏抽棬</span>
- <span v-if="row.vehicleDoorStatus != 'open' && row.vehicleDoorStatus != 'close'">{{ row.vehicleDoorStatus }}</span>
- </template>
- </el-table-column>
- <el-table-column prop="srcIndex" label="璁惧缂栫爜" min-width="180px"></el-table-column>
- <el-table-column prop="ipAddress" label="IP鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="portNo" label="绔彛" min-width="80px"></el-table-column>
- <el-table-column fixed="right" label="鎶撴媿鍥�" min-width="100px">
- <template slot-scope="{row}">
- <el-image v-if="row.backgroundImageDown" style="width: 60px; height: 60px" :src="row.backgroundImageDown"
- :preview-src-list="[row.backgroundImageDown]">
- </el-image>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="160px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
-</template>
-
-<script>
-import BaseTable from '@/components/base/BaseTable'
-import TableLayout from '@/layouts/TableLayout'
-import Pagination from '@/components/common/Pagination'
-import { timeForMat } from '@/utils/util'
-export default {
- name: 'platformEvent',
- extends: BaseTable,
- components: { TableLayout, Pagination },
- data () {
- return {
- // 鎼滅储
- searchForm: {
- plateNo: '',
- motionStatus: '',
- channelName: '',
- platformName: '',
- endDate: '',
- startDate: '',
- radio: '0'
- },
- time: []
- }
- },
- created () {
- this.config({
- module: '鏈堝彴杞﹁締鐘舵�佷簨浠朵氦浜掕褰�',
- api: '/business/platformEvent',
- 'field.id': 'id',
- 'field.main': 'id'
- })
- this.changeRadio('0')
- },
- methods: {
- changeRadio (e) {
- if (e === '0') {
- this.searchForm.startDate = timeForMat(0)[0]
- this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
- } else if (e === '1') {
- this.searchForm.startDate = timeForMat(6)[0]
- this.searchForm.endDate = timeForMat(6)[1]
- this.time = timeForMat(6)
- } else if (e === '2') {
- this.searchForm.startDate = timeForMat(29)[0]
- this.searchForm.endDate = timeForMat(29)[1]
- this.time = timeForMat(29)
- }
- this.search()
- },
- seleTime (e) {
- this.searchForm.startDate = e[0]
- this.searchForm.endDate = e[1]
- this.searchForm.radio = null
- this.search()
- },
- reset () {
- this.$refs.searchForm.resetFields()
- this.searchForm.startDate = ''
- this.searchForm.endDate = ''
- this.time = []
- this.search()
- }
- }
-}
-</script>
diff --git a/admin/src/views/business/platformInterfaceLog.vue b/admin/src/views/business/platformInterfaceLog.vue
deleted file mode 100644
index 70b00ca..0000000
--- a/admin/src/views/business/platformInterfaceLog.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
- <TableLayout :permissions="['business:interfacelog:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鎺ュ彛鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙e悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
- <el-option label="璋冪敤" value="0"></el-option>
- <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
- <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
- <el-table-column label="绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.type == 0">璋冪敤</span>
- <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
- </template>
- </el-table-column>
- <el-table-column label="骞冲彴" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
- <span v-if="row.plat == 1">ERP绯荤粺</span>
- </template>
- </el-table-column>
- <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', {content: row.request})">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', {content: row.repose})">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
- </TableLayout>
-</template>
-
-<script>
-import BaseTable from '@/components/base/BaseTable'
-import TableLayout from '@/layouts/TableLayout'
-import Pagination from '@/components/common/Pagination'
-import OperaInterfaceLogWindow from '@/components/business/OperaInterfaceLogWindow'
-import { timeForMat } from '@/utils/util'
-export default {
- name: 'InterfaceLog',
- extends: BaseTable,
- components: { TableLayout, Pagination, OperaInterfaceLogWindow },
- data () {
- return {
- // 鎼滅储
- searchForm: {
- name: '',
- type: '',
- endDate: '',
- startDate: '',
- radio: '0'
- },
- time: []
- }
- },
- created () {
- this.config({
- module: '涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍',
- api: '/business/platformInterfaceLog',
- 'field.id': 'id',
- 'field.main': 'id'
- })
- this.changeRadio('0')
- },
- methods: {
- changeRadio (e) {
- if (e === '0') {
- this.searchForm.startDate = timeForMat(0)[0]
- this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
- } else if (e === '1') {
- this.searchForm.startDate = timeForMat(6)[0]
- this.searchForm.endDate = timeForMat(6)[1]
- this.time = timeForMat(6)
- } else if (e === '2') {
- this.searchForm.startDate = timeForMat(29)[0]
- this.searchForm.endDate = timeForMat(29)[1]
- this.time = timeForMat(29)
- }
- this.search()
- },
- seleTime (e) {
- this.searchForm.startDate = e[0]
- this.searchForm.endDate = e[1]
- this.searchForm.radio = null
- this.search()
- },
- reset () {
- this.$refs.searchForm.resetFields()
- this.searchForm.startDate = ''
- this.searchForm.endDate = ''
- this.time = []
- this.search()
- }
- }
-}
-</script>
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index 5520b8a..04ed6cf 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -249,14 +249,14 @@
{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }
]
},
-
+
list: [],
pickerOptions: {},
agentList: [],
receivable: '',
meet: '',
-
+
loading: false
}
},
@@ -515,7 +515,7 @@
.main_box {
width: 100%;
display: flex;
- align-items: start;
+ align-items: flex-start;
margin-bottom: 15px;
justify-content: space-between;
.main_box_form {
diff --git a/admin/src/views/roomStatus/index.vue b/admin/src/views/roomStatus/index.vue
index df81122..88f0ef1 100644
--- a/admin/src/views/roomStatus/index.vue
+++ b/admin/src/views/roomStatus/index.vue
@@ -1246,7 +1246,7 @@
.box_content {
width: 100%;
display: flex;
- align-items: start;
+ align-items: flex-start;
justify-content: space-between;
.left {
width: 300px;
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
deleted file mode 100644
index 5659e49..0000000
--- a/admin/src/views/statistics/platformRecord.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
- <div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
- <el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="platformName" label="鏈堝彴鍚嶇О" min-width="100" show-overflow-tooltip />
- <el-table-column prop="platformGroupName" label="鏈堝彴缁�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="carCodeFront" label="杞﹀墠鐗岀収鍙�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="carCodeBack" label="杞﹀悗鐗岀収鍙�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="param1" label="浣滀笟寮�濮�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="param2" label="浣滀笟缁撴潫" min-width="100" show-overflow-tooltip />
- <el-table-column prop="workTime" label="浣滀笟鏃堕暱" min-width="100" show-overflow-tooltip />
- <el-table-column prop="name" label="杩愯緭鍗曞彿/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
- <template v-slot="scope">
- <span>{{ scope.row.billCode || scope.row.contractNum }}</span>
- </template>
- </el-table-column>
- </el-table>
- <div class="mt20">
- <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
- </div>
- </div>
-</template>
-
-<script>
-import Pagination from '@/components/common/Pagination'
-import QueryForm from '@/components/common/QueryForm'
-import dayjs from 'dayjs'
-import duration from 'dayjs/plugin/duration'
-dayjs.extend(duration)
-import { platformLogPage, getPlatformGroupList } from '@/api'
-export default {
- components: {
- Pagination,
- QueryForm
- },
- data() {
- return {
- loading: false,
- pagination: {
- pageSize: 10,
- page: 1,
- total: 0
- },
- filters: {},
- list: [],
- total: 0,
- queryFormConfig: {
- formItems: [
- {
- filed: 'platformName',
- type: 'input',
- label: '鏈堝彴鍚嶇О'
- },
- {
- filed: 'platformGroupId',
- type: 'select',
- label: '鏈堝彴缁�',
- placeholder: '鍏ㄩ儴鏈堝彴缁�',
- options: []
- },
- {
- filed: 'carCodeFront',
- type: 'input',
- label: '杞︾墝鍙�'
- },
- {
- filed: 'selDate',
- type: 'daterange',
- label: '鏃ユ湡'
- }
- ],
- online: true
- }
- }
- },
- created() {
- this.getList()
- this.getGroupList()
- },
- methods: {
- handleSub() {
- this.$refs.ruleForm.validate((valid) => {
- if (valid) {
- alert('submit!')
- }
- })
- },
- getGroupList() {
- getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
- this.queryFormConfig.formItems[1].options = res.map(i => {
- return {
- value: i.id,
- label: i.name
- }
- })
- // this.queryFormConfig.formItems[1].options.unshift({ value: '', label: '鍏ㄩ儴鏈堝彴缁�' })
- })
- },
- getList(page) {
- const { pagination, filters } = this
- this.loading = true
- platformLogPage({
- model: {
- ...filters,
- queryStatus: '6,7,8',
- beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
- },
- sorts: [{ direction: 'DESC', property: 'param1' }],
- capacity: pagination.pageSize,
- page: page || pagination.page,
- }).then(res => {
- this.loading = false
- this.list = res.records || []
- this.list.forEach(item => {
- item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
- item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
- })
- this.pagination.total = res.total || 0
- }, () => {
- this.loading = false
- })
- },
- clear() {
- this.filters = {}
- this.pagination.pageSize = 10
- this.pagination.page = 1
- this.getList()
- },
- handleSizeChange(capacity) {
- this.pagination.pageSize = capacity
- this.getList()
- }
- }
-}
-</script>
-
-<style></style>
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
deleted file mode 100644
index 520748a..0000000
--- a/admin/src/views/statistics/platformStatic.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
- <div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
- <template #fastdate>
- <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="6">杩�7澶�</el-radio-button>
- <el-radio-button label="29">杩�30澶�</el-radio-button>
- </el-radio-group>
- </template>
- </QueryForm>
- <el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="name" label="鏈堝彴鍚嶇О" min-width="100" show-overflow-tooltip />
- <el-table-column prop="groupName" label="鏈堝彴缁�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="stopCount" label="鍋滈潬娆℃暟(娆�)" min-width="100" show-overflow-tooltip />
- <el-table-column prop="workCountTime" label="宸ヤ綔鏃堕暱" min-width="100" show-overflow-tooltip />
- <el-table-column prop="useRata" label="鏈堝彴浣跨敤鐜�" min-width="100" show-overflow-tooltip />
- </el-table>
- <!-- <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" /> -->
- </div>
-</template>
-
-<script>
-import Pagination from '@/components/common/Pagination'
-import QueryForm from '@/components/common/QueryForm'
-import dayjs from 'dayjs'
-import { platformWorkReportPage, getPlatformGroupList } from '@/api'
-export default {
- components: {
- Pagination,
- QueryForm
- },
- data() {
- return {
- loading: false,
- pagination: {
- pageSize: 10,
- page: 1,
- total: 0
- },
- filters: {
- fastdate: 0,
- selDate: []
- },
- list: [],
- total: 0,
- queryFormConfig: {
- formItems: [
- {
- filed: 'name',
- type: 'input',
- label: '鏈堝彴鍚嶇О'
- },
- {
- filed: 'groupId',
- type: 'select',
- label: '鏈堝彴缁�',
- placeholder: '鍏ㄩ儴鏈堝彴缁�',
- options: []
- },
- {
- type: 'slot',
- filed: 'fastdate',
- label: ''
- },
- {
- filed: 'selDate',
- type: 'daterange',
- clearable: false,
- label: '鏃ユ湡'
- }
- ],
- online: true
- }
- }
- },
- created() {
- this.changeRadio('0')
- this.getGroupList()
- },
- methods: {
- changeRadio(day) {
- const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
- this.$set(this.filters, 'selDate', arr)
- this.getList()
- },
- handleSub() {
- this.$refs.ruleForm.validate((valid) => {
- if (valid) {
- alert('submit!')
- }
- })
- },
- getGroupList() {
- getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
- this.queryFormConfig.formItems[1].options = res.map(i => {
- return {
- value: i.id,
- label: i.name
- }
- })
- // this.queryFormConfig.formItems[1].options.unshift({ value: '', label: '鍏ㄩ儴鏈堝彴缁�' })
- })
- },
- getList(page) {
- const { pagination, filters } = this
- this.loading = true
- platformWorkReportPage({
- ...filters,
- queryDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- queryDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
- }).then(res => {
- this.loading = false
- this.list = res || []
- this.list.forEach(item => {
- item.useRata = item.useRata + '%'
- item.workCountTime = item.workCountTime + '鏃�'
- // item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
- })
- }, () => {
- this.loading = false
- })
- },
- clear() {
- this.filters = {
- fastdate: 0,
- selDate: []
- }
- this.changeRadio('0')
- },
- handleSizeChange(capacity) {
- this.pagination.pageSize = capacity
- this.getList()
- }
- }
-}
-</script>
-
-<style></style>
--
Gitblit v1.9.3