1.调整

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({

src/views/statistics/index.vue

@@ -0,0 +1,97 @@
+<template>
+  <div class="app-container home">
+    1111111111111111111
+  </div>
+</template>
+
+<script>
+import { getBalance } from '@/api/system/dept'
+
+export default {
+  name: "Index",
+  data() {
+    return {
+      // 版本号
+      version: "3.8.7",
+      balance: null,
+      userName: null
+    };
+  },
+  created() {
+    this.userName = this.$store.state.user.name;
+    getBalance().then(response => {
+      this.balance = response.data;
+    });
+  },
+  methods: {
+    goTarget(href) {
+      window.open(href, "_blank");
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.home {
+  blockquote {
+    padding: 10px 20px;
+    margin: 0 0 20px;
+    font-size: 17.5px;
+    border-left: 5px solid #eee;
+  }
+  hr {
+    margin-top: 20px;
+    margin-bottom: 20px;
+    border: 0;
+    border-top: 1px solid #eee;
+  }
+  .col-item {
+    margin-bottom: 20px;
+  }
+
+  ul {
+    padding: 0;
+    margin: 0;
+  }
+
+  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  color: #676a6c;
+  overflow-x: hidden;
+
+  ul {
+    list-style-type: none;
+  }
+
+  h4 {
+    margin-top: 0px;
+  }
+
+  h2 {
+    margin-top: 10px;
+    font-size: 26px;
+    font-weight: 100;
+  }
+
+  p {
+    margin-top: 10px;
+
+    b {
+      font-weight: 700;
+    }
+  }
+
+  .update-log {
+    ol {
+      display: block;
+      list-style-type: decimal;
+      margin-block-start: 1em;
+      margin-block-end: 1em;
+      margin-inline-start: 0;
+      margin-inline-end: 0;
+      padding-inline-start: 40px;
+    }
+  }
+}
+</style>
+

src/views/system/device/index.vue

@@ -265,6 +265,13 @@
             @click="ring(scope.row)"
             v-hasPermi="['system:device:ring']"
           >响铃</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-unlock"
+            @click="seatCushionLock(scope.row)"
+            v-hasPermi="['system:device:ring']"
+          >坐垫锁</el-button>
           <el-button
             size="mini"
             type="text"
@@ -890,6 +897,17 @@ export default {
         });
       });
     },
+    seatCushionLock(row) {
+      this.reset();
+      const deviceId = row.deviceId || this.ids
+      getDevice(deviceId).then(response => {
+        let form1 = response.data;
+        seatCushionLock(form1).then(response => {
+          this.getList();
+          this.$modal.msgSuccess("操作成功");
+        });
+      });
+    },
     reboot(row) {
       this.reset();
       const deviceId = row.deviceId || this.ids

src/views/system/fee/index.vue

@@ -161,7 +161,7 @@
               </el-col>
               <el-col :span="4">
                 <el-form-item prop="startingTime">
-                  <el-input v-model="startingTime" placeholder="请输入起步时间" />
+                  <el-input v-model="form.startingTime" placeholder="请输入起步时间" />
                 </el-form-item>
               </el-col>
               <el-col :span="2" style="line-height: 32px;">
@@ -172,7 +172,7 @@
           <el-form-item label="超出价">
             <el-row :gutter="10">
               <el-col :span="4">
-                <el-input v-model="timeoutPrice" placeholder="请输入超出价格" />
+                <el-input v-model="form.timeoutPrice" placeholder="请输入超出价格" />
               </el-col>
               <el-col :span="2" style="line-height: 32px;">
                 元/
@@ -423,14 +423,14 @@ export default {
         sectionCharges: [
           { required: true, message: '请输入区间收费', trigger: 'blur' },
         ],
-        // startingTime: [
+        startingTime: [
-        //   { required: true, message: '请输入起步时间', trigger: 'blur' },
+          { required: true, message: '请输入起步时间', trigger: 'blur' },
-        //   { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
+          { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
-        // ],
+        ],
-        // timeoutTime: [
+        timeoutTime: [
-        //   { required: true, message: '请输入超时时间', trigger: 'blur' },
+          { required: true, message: '请输入超时时间', trigger: 'blur' },
-        //   { pattern: /^\d+$/, 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 = ''
       }
     },