shaogen1995 3 lat temu
rodzic
commit
6d88ebd7bd

+ 6 - 0
src/assets/css/base.css

@@ -48,4 +48,10 @@ input::-webkit-inner-spin-button {
 }
 input[type="number"] {
 -moz-appearance: textfield;
+}
+.el-dialog{
+  min-width: 652px;
+}
+.el-upload__tip{
+  font-size: 14px;
 }

+ 2 - 2
src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 const service = axios.create({
   // baseURL: 'http://192.168.0.135:8011/', // 本地调试
-  // baseURL: 'http://8.135.106.227:8012/', // 线上调试
-  baseURL: '', // build
+  baseURL: 'http://8.135.106.227:8012/', // 线上调试
+  // baseURL: '', // build
   timeout: 5000
 })
 // 请求拦截器

+ 3 - 3
src/views/login.vue

@@ -82,11 +82,11 @@ export default {
     display: flex;
     align-items: center;
     &>img {
-      width: 35px;
-      height: 35px;
+      width: 50px;
+      // height: 60px;
       border-radius: 50%;
       overflow: hidden;
-      margin: 0 30px;
+      margin: 0 10px 0 30px;
     }
     &>P {
       color: #fff;

+ 16 - 16
src/views/tab4/edit2.vue

@@ -10,61 +10,61 @@
         label-width="130px"
         class="demo-ruleForm"
       >
-        <el-form-item label="摄像头-启用:" prop="cameraStart">
+        <el-form-item label="监控-启用:" prop="cameraStart">
           <el-input
             v-model.number="ruleForm.cameraStart"
             type="number"
           ></el-input>
-          <span class="unit">个</span>
+          <!-- <span class="unit">个</span> -->
         </el-form-item>
-        <el-form-item label="摄像头-停用:" prop="cameraStop">
+        <el-form-item label="监控-停用:" prop="cameraStop">
           <el-input
             v-model.number="ruleForm.cameraStop"
             type="number"
           ></el-input>
-          <span class="unit">个</span>
+          <!-- <span class="unit">个</span> -->
         </el-form-item>
-        <el-form-item label="巡逻车-启用:" prop="cruiserStart">
+        <el-form-item label="消防-启用:" prop="cruiserStart">
           <el-input
             v-model.number="ruleForm.cruiserStart"
             type="number"
           ></el-input>
-          <span class="unit">辆</span>
+          <!-- <span class="unit">辆</span> -->
         </el-form-item>
-        <el-form-item label="巡逻车-停用:" prop="cruiserStop">
+        <el-form-item label="消防-停用:" prop="cruiserStop">
           <el-input
             v-model.number="ruleForm.cruiserStop"
             type="number"
           ></el-input>
-          <span class="unit">辆</span>
+          <!-- <span class="unit">辆</span> -->
         </el-form-item>
-        <el-form-item label="门禁锁-启用:" prop="doorStart">
+        <el-form-item label="监测-启用:" prop="doorStart">
           <el-input
             v-model.number="ruleForm.doorStart"
             type="number"
           ></el-input>
-          <span class="unit">个</span>
+          <!-- <span class="unit">个</span> -->
         </el-form-item>
-        <el-form-item label="门禁锁-停用:" prop="doorStop">
+        <el-form-item label="监测-停用:" prop="doorStop">
           <el-input
             v-model.number="ruleForm.doorStop"
             type="number"
           ></el-input>
-          <span class="unit">个</span>
+          <!-- <span class="unit">个</span> -->
         </el-form-item>
-        <el-form-item label="无人机-启用:" prop="aerialStart">
+        <el-form-item label="供能-启用:" prop="aerialStart">
           <el-input
             v-model.number="ruleForm.aerialStart"
             type="number"
           ></el-input>
-          <span class="unit">辆</span>
+          <!-- <span class="unit">辆</span> -->
         </el-form-item>
-        <el-form-item label="无人机-停用:" prop="aerialStop">
+        <el-form-item label="供能-停用:" prop="aerialStop">
           <el-input
             v-model.number="ruleForm.aerialStop"
             type="number"
           ></el-input>
-          <span class="unit">辆</span>
+          <!-- <span class="unit">辆</span> -->
         </el-form-item>
         <el-form-item label="更新时间:">
           <i class="biaoshi"></i>

+ 1 - 1
src/views/tab4/index.vue

@@ -160,7 +160,7 @@ export default {
           temp.conten = `摄像头:${temp.data.camera}个;巡逻车:${temp.data.cruiser}辆;门禁锁:${temp.data.door}个;无人机:${temp.data.aerial}辆`
         } else {
           temp.type = '设备情况'
-          temp.conten = `摄像头-启用:${temp.data.cameraStart}个;摄像头-停用:${temp.data.cameraStop}个;巡逻车-启用:${temp.data.cruiserStart}辆;巡逻车-停用:${temp.data.cruiserStop}辆;门禁锁-启用:${temp.data.doorStart}个;门禁锁-停用:${temp.data.doorStop}个;无人机-启用:${temp.data.aerialStart}辆;无人机-停用:${temp.data.aerialStop}辆`
+          temp.conten = `监控-启用:${temp.data.cameraStart}个;监控-停用:${temp.data.cameraStop}个;消防-启用:${temp.data.cruiserStart}辆;消防-停用:${temp.data.cruiserStop}辆;监测-启用:${temp.data.doorStart}个;监测-停用:${temp.data.doorStop}个;供能-启用:${temp.data.aerialStart}辆;供能-停用:${temp.data.aerialStop}辆`
         }
         this.tableData.push(temp)
       })