样式修改

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,20 +1,11 @@
 <template>
   <!-- <div>数据统计组件</div> -->
   <div class="flex-1 flex-column">
-    <div
-      :key="item.id"
-      class="flex-1 flex-nowrap mt-2 align-center justify-space-between box"
-      v-for="item in lists"
-    >
+    <div :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
-          :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 :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>
     </div>
@@ -41,7 +32,7 @@ export default {
         {
           id: 3,
           name: '称重传感器3',
-          number: ['0', '.', '0'],
+          number: ['0', '0', '.', '0'],
         },
         {
           id: 4,
@@ -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/Panel/Panel.vue

@@ -28,9 +28,20 @@
             <a-icon class="down-icon" type="caret-down" />
           </span>
         </div>
-        <a-progress :percent="percent" :show-info="false" :stroke-color="strokeColor" :stroke-width="strokeWidth" status="active" />
+        <a-progress
+          :percent="percent"
+          :show-info="false"
+          :stroke-color="strokeColor"
+          :stroke-width="strokeWidth"
+          status="active"
+        />
         <div class="flex-1" style="width: 106%; margin-left: -3%">
-          <div class="flex-1" style="justify-content: center" v-for="(item, index) in lists" :key="index">{{ item }}</div>
+          <div
+            :key="index"
+            class="flex-1"
+            style="justify-content: center"
+            v-for="(item, index) in lists"
+          >{{ item }}</div>
         </div>
       </div>
     </div>
@@ -77,7 +88,6 @@ export default {
   computed: mapState('messages', ['weightMessage', 'bolusDose', 'maintenanceDose', 'thrombolyticDose', 'startMessages', 'rfidMessage']),
   watch: {
     rfidMessage(val) {
-      console.log(val);
       if (this.startMessages) {
         this.percent = 0;
         this.percentA = 0;

src/components/RFID/RFID.vue

@@ -32,8 +32,8 @@ export default {
         { code: '25', active: false, name: '专用电梯（四楼）' },
         { code: '26', active: false, name: 'CCU导管室' },
       ],
-      num: 0, //当前正在展示的div
-      t: null,
+      num: null, //当前正在展示的div
+      timer: null,
     };
   },
 
@@ -46,11 +46,18 @@ export default {
   },
 
   watch: {
-    rfidMessage: {
-      handler(value) {
+    rfidMessage(value) {
+      if (value && value.step) {
+        if (this.timer) {
+          clearInterval(this.timer);
+          this.timer = null;
+        }
         this.setLight(value.step);
-      },
-      deep: true,
+      } else {
+        if (!this.timer && this.num === null) {
+          this.setTime();
+        }
+      }
     },
   },
 
@@ -58,8 +65,9 @@ export default {
     if (this.rfidMessage && this.rfidMessage.step) {
       this.setLight(this.rfidMessage.step);
     } else {
-      this.setLight();
+      this.setTime();
     }
+    // this.setTime();
     // this.changePage();
   },
 
@@ -77,9 +85,10 @@ export default {
     // 定时高亮
     setTime() {
       let i = 0;
-      this.t = setInterval(() => {
+      this.timer = setInterval(() => {
         this.lists.forEach((element, j) => {
           if (j === i) {
+            // debugger;
             element.active = true;
             // 翻页
             for (let a = 0; a < this.newArr.length; a++) {
@@ -113,29 +122,25 @@ export default {
 
     // 收到消息高亮
     setLight(step) {
-      if (step) {
-        clearInterval(this.t);
-        this.lists.forEach((element, j) => {
-          if (element.code === step) {
-            element.active = true;
-            // 翻页
-            for (let a = 0; a < this.newArr.length; a++) {
-              const arr = this.newArr[a];
-              const item = arr.find(item => item.name === element.name);
-              if (item) {
-                this.num = a;
-              }
+      if (this.timer) {
+        clearInterval(this.timer);
+        this.timer = null;
+      }
+      this.lists.forEach((element, j) => {
+        if (element.code === step) {
+          element.active = true;
+          // 翻页
+          for (let a = 0; a < this.newArr.length; a++) {
+            const arr = this.newArr[a];
+            const item = arr.find(item => item.name === element.name);
+            if (item) {
+              this.num = a;
             }
-          } else {
-            element.active = false;
           }
-        });
-      } else {
-        // if (this.t) {
-        //   clearInterval(this.t);
-        // }
-        this.setTime();
-      }
+        } else {
+          element.active = false;
+        }
+      });
     },
   },
 };

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,11 +71,11 @@ const mixin = {
             case 1: // 体重
               // 收到同步消息
               // 把消息添加到store 的消息栈中
-              this.setStartMessages(true);
               this.messagesAddWeight(data.data.value);
               break;
             case 2: // RFID
               this.messagesAddRfid(data.data);
+              console.log('data.data: ', data.data);
               break;
             case 3: // 称重传感器一
               this.messagesAddWeighSensor1(data.data.value);