Browse Source

rfid bug

master
lucky 5 years ago
parent
commit
b75f865c9c
  1. 16
      src/components/Panel/Panel.vue
  2. 60
      src/components/RFID/RFID.vue
  3. 1
      src/mixins/socket.js

16
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;

60
src/components/RFID/RFID.vue

@ -37,8 +37,8 @@ export default {
{ code: '25', active: false, name: '专用电梯(四楼)' },
{ code: '26', active: false, name: 'CCU导管室' },
],
num: 0, //div
t: null,
num: null, //div
timer: null,
};
},
@ -51,11 +51,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();
}
}
},
},
@ -63,8 +70,9 @@ export default {
if (this.rfidMessage && this.rfidMessage.step) {
this.setLight(this.rfidMessage.step);
} else {
this.setLight();
this.setTime();
}
// this.setTime();
// this.changePage();
},
@ -82,9 +90,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++) {
@ -118,26 +127,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 {
this.setTime();
}
} else {
element.active = false;
}
});
},
},
};

1
src/mixins/socket.js

@ -76,6 +76,7 @@ const mixin = {
break;
case 2: // RFID
this.messagesAddRfid(data.data);
console.log('data.data: ', data.data);
break;
case 3: // 称重传感器一
this.messagesAddWeighSensor1(data.data.value);

Loading…
Cancel
Save