Merge branch 'master' into liuxing

app/src/api/index.js

@@ -0,0 +1,10 @@
+import {request} from '@zhgkpt/utils'
+/**
+ * 请求首页数据
+ * 
+ * @url /order/totaldata
+ * @method get
+ */
+export function totaldata() {
+  return request.get('/order/totaldata')
+}

app/src/views/Home/components/WisdomFire.vue

@@ -15,7 +15,7 @@
       <!-- 设备数 -->
 
       <div class="point-num">
-        <div class="build-num">
+        <div class="build-num" style="background: none; margin-bottom: 10px">
           <div class="build">
             <span
               >设备总数
@@ -31,35 +31,54 @@
             </span>
           </div>
         </div>
+        <div>
+          <span class="onlines on-line" style="margin: 0px 20px"> 在线</span>
+          <span class="offlines on-line">离线</span>
+        </div>
         <div class="pressure">
-          <div class="pressure-num">
-            <div class="pressure-bg">2436</div>
+          <div class="pressure-num" v-for="(item, index) in 3">
+            <div class="pressure-bg">
+              2436/35
+              <div style="font-size: 12px; margin-top: 5px">个(栋)</div>
+            </div>
+
             <ul class="pressure-list">
-              <li>水压监测点位（个）</li>
+              <li style="font-size: 12px; margin: 6px 0 0 9px">
+                水压监测点位（个）
+              </li>
               <li class="pressure-line">
-                <span>在线</span>
-                <img
+                <!-- 在线 -->
+                <span class="onlines on-line"></span>
+                <!-- <img
                   class="pressure-img"
                   src="../../assets/images/Ellipse 275.png"
                   alt=""
-                />
-                <span class="bumer">2670 </span>
-                <span class="unit">个</span>
+                /> -->
+                <span class="bumer" style="font-size: 16px; margin-left: 2px"
+                  >2670/100
+                  <span class="unit" style="font-size: 12px">(个/栋)</span>
+                </span>
               </li>
               <li class="pressure-line">
-                <span>告警</span>
-                <img
+                <!-- 离线 -->
+                <span class="offlines on-line"></span>
+                <!-- <img
                   class="pressure-img"
                   src="../../assets/images/Ellipse 275 (1).png"
                   alt=""
-                />
-                <span class="bumer">3144</span>
-                <span class="unit">个</span>
+                /> -->
+                <span class="bumer" style="margin-left: 2px"
+                  >3144/100
+                  <span style="font-size: 12px">(个/栋)</span>
+                </span>
+                <!-- <span class="unit">(个/栋)</span> -->
               </li>
             </ul>
           </div>
-          <div class="pressure-num">
-            <div class="pressure-bg">2436</div>
+          <!-- <div class="pressure-num">
+            <div class="pressure-bg">2436/35
+              <div style="font-size: 12px; margin-top: 5px;">个(栋)</div>
+            </div>
             <ul class="pressure-list">
               <li>水压监测点位（个）</li>
               <li class="pressure-line">
@@ -85,7 +104,9 @@
             </ul>
           </div>
           <div class="pressure-num">
-            <div class="pressure-bg">2436</div>
+            <div class="pressure-bg">2436/35
+              <div style="font-size: 12px; margin-top: 5px;">个(栋)</div>
+            </div>
             <ul class="pressure-list">
               <li>水压监测点位（个）</li>
               <li class="pressure-line">
@@ -109,21 +130,29 @@
                 <span class="unit">个</span>
               </li>
             </ul>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
   </div>
 </template>
 
-<script></script>
+<script>
+export default {
+  data() {
+    return {
+      listNum: ["水压监测点位", "电气火灾监测点位", "生命通道监测点位"],
+    };
+  },
+};
+</script>
 
 <style scoped>
 .num-box {
   width: 414px;
   display: flex;
   flex-direction: column;
-  padding: 20px 15px;
+  padding: 10px 12px;
 }
 .build-num {
   width: 100%;
@@ -141,7 +170,7 @@
 }
 .point-num {
   flex: 1;
-  margin-top: 10px;
+  /* margin-top: 10px; */
 }
 .num {
   font-size: 30px;
@@ -168,10 +197,11 @@ img {
   justify-content: space-between;
 }
 .pressure-num {
-  width: 30%;
+  /* width: 30%; */
   height: 150px;
-  letter-spacing: 1px;
+  /* letter-spacing: 1px; */
   font-size: 12px;
+  text-align: center;
 }
 .pressure-img {
   display: inline-block !important;
@@ -182,31 +212,46 @@ img {
 .pressure-list {
   font-size: 12px;
   color: #fff;
-  line-height: 25px;
+  text-align: left;
   font-family: "Abel";
 }
+.onlines::after {
+  background-color: #2fde60;
+}
+.offlines::after {
+  background-color: #ff4f4f;
+}
+.on-line::after {
+  content: "";
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  margin-left: 5px;
+}
+.on-line {
+  letter-spacing: 2px;
+}
 .pressure-bg {
   width: 66px;
   height: 77px;
   background: url("@/assets/images/water.png") no-repeat;
-  font-size: 24px;
+  font-size: 20px;
   text-align: center;
   padding-left: 3px;
-  padding-top: 20px;
+  padding-top: 10px;
   box-sizing: border-box;
   margin: auto;
 }
-.pressure-line {
+/* .pressure-line {
   display: flex;
   justify-content: space-between;
   align-items: center;
-}
+} */
 .bumer {
-  width: 50px;
+  display: inline-block;
   font-size: 16px;
-  font-family: "Abel";
-  text-align: center;
-  /* margin-right: 8px; */
+  margin-top: 5px;
 }
 .unit {
   margin-right: 12px;

app/src/views/Iot/components/AlarmHandling.vue

@@ -173,7 +173,7 @@
       display: flex;
       justify-content: space-between;
       align-items: center;
-      font-size: 16px;
+      font-size: 14px;
       background-color: rgba(0, 0, 0, 0.2);
       .time,
       .num,

utils/index.js

@@ -1,3 +1,4 @@
+import request from './request'
 export function withInstall(component) {
   component.install = function (app) {
     app.component(component.name, component);
@@ -11,3 +12,6 @@ export function WithInstallOfGlobalMethod(globalName, method) {
   };
   return method;
 }
+export {
+  request
+}

utils/package.json

@@ -13,5 +13,8 @@
   "license": "ISC",
   "devDependencies": {
     "lodash": "^4.17.21"
+  },
+  "dependencies": {
+    "axios": "^1.4.0"
   }
 }

utils/request.js

@@ -0,0 +1,28 @@
+import axios from 'axios'
+
+// 创建一个axios实例
+const instance = axios.create({
+  // baseURL: 'http://47.108.149.141:3000'
+  baseURL: '/api'
+})
+
+// 配置请求拦截器
+instance.interceptors.request.use(config => {
+  // console.log(config)
+  /* 
+//     每一次请求的时候，往请求头（header）上添加一个token
+//   */
+//   const token = sessionStorage.getItem('token')
+//   config.headers.Authorization = token
+  return config
+}, err => {
+  return Promise.reject(err)
+})
+
+// 配置响应拦截器
+instance.interceptors.response.use(config => {
+  return config
+}, err => {
+  return Promise.reject(err)
+})
+export default instance;