From 51a68735bde6b44027b7b069c2e6179e23d5269e Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Thu, 18 Jul 2024 14:27:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/device.js | 8 +++
src/views/statistics/index.vue | 97 +++++++++++++++++++++++++++++++
src/views/system/device/index.vue | 18 ++++++
src/views/system/fee/index.vue | 36 ++++++------
4 files changed, 141 insertions(+), 18 deletions(-)
create mode 100644 src/views/statistics/index.vue
diff --git a/src/api/system/device.js b/src/api/system/device.js
index fd6cd4f..80696d6 100644
--- a/src/api/system/device.js
+++ b/src/api/system/device.js
@@ -109,6 +109,14 @@ export function ring(data){
})
}
+// 坐垫锁
+export function seatCushionLock(data){
+ return request({
+ url: '/app/device/seatCushionLockByMac?mac='+data.mac,
+ method: 'post'
+ })
+}
+
// 重启设备
export function reboot(data){
return request({
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
new file mode 100644
index 0000000..1fafa69
--- /dev/null
+++ b/src/views/statistics/index.vue
@@ -0,0 +1,97 @@
+
+
+ 1111111111111111111
+
+
+
+
+
+
+
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index e9542a9..512dfcb 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -265,6 +265,13 @@
@click="ring(scope.row)"
v-hasPermi="['system:device:ring']"
>响铃
+ 坐垫锁
{
+ let form1 = response.data;
+ seatCushionLock(form1).then(response => {
+ this.getList();
+ this.$modal.msgSuccess("操作成功");
+ });
+ });
+ },
reboot(row) {
this.reset();
const deviceId = row.deviceId || this.ids
diff --git a/src/views/system/fee/index.vue b/src/views/system/fee/index.vue
index 858d24e..e8245cb 100644
--- a/src/views/system/fee/index.vue
+++ b/src/views/system/fee/index.vue
@@ -161,7 +161,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
元/
@@ -423,14 +423,14 @@ export default {
sectionCharges: [
{ required: true, message: '请输入区间收费', trigger: 'blur' },
],
- // startingTime: [
- // { required: true, message: '请输入起步时间', trigger: 'blur' },
- // { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
- // ],
- // timeoutTime: [
- // { required: true, message: '请输入超时时间', trigger: 'blur' },
- // { pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' }
- // ],
+ startingTime: [
+ { required: true, message: '请输入起步时间', trigger: 'blur' },
+ { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
+ ],
+ timeoutTime: [
+ { required: true, message: '请输入超时时间', trigger: 'blur' },
+ { pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' }
+ ],
},
};
},
@@ -497,9 +497,9 @@ export default {
this.enablelnterval = false,
this.more = { start: '', end: '9999', eachUnit: '', fee: '' }
this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }],
- this.timeoutTime = '',
+ this.form.timeoutTime = '',
this.startingPrice = '',
- this.startingTime = '',
+ this.form.startingTime = '',
this.timeoutPrice = '',
this.resetForm("form")
},
@@ -543,9 +543,9 @@ export default {
// delete this.form.ridingRuleJson;
let json = JSON.parse(response.data.ridingRuleJson)
if (this.form.ridingRule == 1) {
- this.timeoutTime = json.timeoutTime
+ this.form.timeoutTime = json.timeoutTime
this.startingPrice = json.startingPrice
- this.startingTime = json.startingTime
+ this.form.startingTime = json.startingTime
this.timeoutPrice = json.timeoutPrice
} else {
this.rule = json.rule.slice(0, -1);
@@ -580,9 +580,9 @@ export default {
data.ridingRuleJson.enablelnterval = this.enablelnterval
} else {
- data.ridingRuleJson.timeoutTime = this.timeoutTime
+ data.ridingRuleJson.timeoutTime = this.form.timeoutTime
data.ridingRuleJson.startingPrice = this.startingPrice
- data.ridingRuleJson.startingTime = this.startingTime
+ data.ridingRuleJson.startingTime = this.form.startingTime
data.ridingRuleJson.timeoutPrice = this.timeoutPrice
}
@@ -636,9 +636,9 @@ export default {
this.enablelnterval = false
this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }]
- this.timeoutTime = ''
+ this.form.timeoutTime = ''
this.startingPrice = ''
- this.startingTime = ''
+ this.form.startingTime = ''
this.timeoutPrice = ''
}
},