Merge branch 'master' of dd.tall.wiki:binbin0314/salt-lake-hospital

src/components/Duration/Duration.js

@@ -16,7 +16,7 @@ const mixin = {
         legend: {
           x: 'center',
           y: 'bottom',
-          data: ['我院记录', '国际水准', '当前数据'],
+          data: ['我院标准', '国际标准', '当前数据'],
           textStyle: {
             fontWeight: 'normal',
             color: '#ccc', //标题颜色
@@ -80,7 +80,7 @@ const mixin = {
         },
         series: [
           {
-            name: '我院记录',
+            name: '我院标准',
             type: 'line',
             connectNulls: true,
             stack: '总量',
@@ -95,7 +95,7 @@ const mixin = {
             // },
           },
           {
-            name: '国际水准',
+            name: '国际标准',
             type: 'line',
             connectNulls: true,
             stack: '总量',

src/components/LoadCells/LoadCells.vue

@@ -1,19 +1,10 @@
 <template>
   <!-- <div>数据统计组件</div> -->
   <div class="flex-1 flex-column">
-    <div
+    <div :key="item.id" class="flex-1 flex-nowrap mt-2 align-center justify-space-between box" v-for="item in lists">
-      :key="item.id"
-      class="flex-1 flex-nowrap mt-2 align-center justify-space-between box"
-      v-for="item in lists"
-    >
       <div class="title">{{ item.name }}</div>
       <div class="number flex-1">
-        <div
+        <div :key="a" :style="item.number[a - 1] === '.' ? 'padding-right:5%' : ''" class="num_item" v-for="a in 7">
-          :key="a"
-          :style="item.number[a-1] === '.' ? 'padding-right:5%' : '' "
-          class="num_item"
-          v-for="a in 7"
-        >
           <span>{{ item.number[a - 1] ? item.number[a - 1] : 0 }}</span>
         </div>
       </div>
@@ -58,22 +49,46 @@ export default {
     weighSensor1: {
       handler(value) {
         this.lists[0].number = value.split('');
+        if (this.lists[0].number.length < 7) {
+          var num = 7 - this.lists[0].number.length;
+          for (var a = 0; a < num; a++) {
+            this.lists[0].number.unshift('0');
+          }
+        }
       },
       deep: true,
     },
     weighSensor2(value) {
       if (value) {
         this.lists[1].number = value.split('');
+        if (this.lists[1].number.length < 7) {
+          var num = 7 - this.lists[1].number.length;
+          for (var a = 0; a < num; a++) {
+            this.lists[1].number.unshift('0');
+          }
+        }
       }
     },
     weighSensor3(value) {
       if (value) {
         this.lists[2].number = value.split('');
+        if (this.lists[2].number.length < 7) {
+          var num = 7 - this.lists[2].number.length;
+          for (var a = 0; a < num; a++) {
+            this.lists[2].number.unshift('0');
+          }
+        }
       }
     },
     weighSensor4(value) {
       if (value) {
         this.lists[3].number = value.split('');
+        if (this.lists[3].number.length < 7) {
+          var num = 7 - this.lists[3].number.length;
+          for (var a = 0; a < num; a++) {
+            this.lists[3].number.unshift('0');
+          }
+        }
       }
     },
   },

src/components/RFID/RFID.vue

@@ -1,12 +1,7 @@
 <template>
   <div class="flex-1 flex-column rfid">
     <div :key="i + 1" v-for="(arr, i) in newArr" v-show="i === num">
-      <div
+      <div :class="`list${index + 1} ${item.active ? 'active' : ''}`" :key="index" class="list" v-for="(item, index) in arr">
-        :class="`list${index + 1} ${item.active ? 'active' : ''}`"
-        :key="index"
-        class="list"
-        v-for="(item, index) in arr"
-      >
         <span>{{ item.name }}</span>
       </div>
     </div>
@@ -115,15 +110,15 @@ export default {
       }, 1500);
     },
 
-    // 分页
+    // // 分页
-    changePage() {
+    // changePage() {
-      setInterval(() => {
+    //   setInterval(() => {
-        this.num++;
+    //     this.num++;
-        if (this.num === this.newArr.length) {
+    //     if (this.num === this.newArr.length) {
-          this.num = 0;
+    //       this.num = 0;
-        }
+    //     }
-      }, 5000);
+    //   }, 5000);
-    },
+    // },
 
     // 收到消息高亮
     setLight(step) {

src/components/Sensor/Sensor.js

@@ -14,7 +14,7 @@ const mixin = {
         legend: {
           x: 'center',
           y: '8%',
-          data: ['传感器1', '传感器2', '传感器3'],
+          data: ['X轴', 'Y轴', 'Z轴'],
           textStyle: {
             fontWeight: 'normal',
             color: '#ccc', //标题颜色
@@ -53,7 +53,7 @@ const mixin = {
         },
         series: [
           {
-            name: '传感器1',
+            name: 'X轴',
             data: this.series1,
             type: 'line',
             smooth: true,
@@ -82,7 +82,7 @@ const mixin = {
             lineStyle: { normal: { color: 'rgb(39,149,243)', width: 2 } },
           },
           {
-            name: '传感器2',
+            name: 'Y轴',
             data: this.series2,
             type: 'line',
             smooth: true,
@@ -116,7 +116,7 @@ const mixin = {
             },
           },
           {
-            name: '传感器3',
+            name: 'Z轴',
             data: this.series3,
             type: 'line',
             smooth: true,

src/config/api.js

@@ -17,5 +17,5 @@ export const record = params => axios.post(`${wisdomcar}/debug/record`, params);
 
 // 急救数量统计图数据
 export const selResult = params => axios.post(`${statistics}/get/selResult`, params);
-// 急救市场分析统计图数据
+// 急救时长分析统计图数据
 export const getPointTime = params => axios.post(`${statistics}/getPointTime`, params);

src/mixins/socket.js

@@ -71,7 +71,6 @@ const mixin = {
             case 1: // 体重
               // 收到同步消息
               // 把消息添加到store 的消息栈中
-              this.setStartMessages(true);
               this.messagesAddWeight(data.data.value);
               break;
             case 2: // RFID