diff --git a/src/store/module/MicroExhibition.ts b/src/store/module/MicroExhibition.ts
index a0e195d..d31a3be 100644
--- a/src/store/module/MicroExhibition.ts
+++ b/src/store/module/MicroExhibition.ts
@@ -20,7 +20,7 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
state: () => {
return {
devlist: [],
- devnum: { all: 17, wait: 1, off: 3, on: 0 },
+ devnum: { all: 17, wait: 7, off: 3, on: 7 },
caijian: {
'value': [ //'设备名称', '设备编码', '稼动率', '状态' //0:停机 1:待机 2:工作 3:待机
['全自动针梭两用铺布机', '1050910', '95%', '0'],
diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue
index a1307ba..5188e11 100644
--- a/src/views/MicroExhibition/index.vue
+++ b/src/views/MicroExhibition/index.vue
@@ -11,7 +11,8 @@
-
+
@@ -55,7 +56,8 @@
-
+
@@ -101,18 +103,19 @@ import BarChart from './components/BarChart.vue'
import ringChart from "./components/ringChart.vue";
import BoardBar from "./components/BoardBar.vue";
-import { ref, onMounted, onUnmounted, getCurrentInstance, watch, onUpdated } from 'vue'
+import { ref, onMounted, onUnmounted, getCurrentInstance, watch, onUpdated, computed } from 'vue'
import { useMicroExhibitionStore } from '@/store/module/MicroExhibition'
import { useI18n } from 'vue-i18n'
let { t } = useI18n();
const store = useMicroExhibitionStore()
-let ringData = ref([]);
-ringData.value = [
- { name: '工作', value: 7 },
- { name: '停机', value: 7 },
- { name: '待机', value: 3 },
-]
+let ringData = computed(() => {
+ return [
+ { name: '工作', value: store.devnum.on },
+ { name: '停机', value: store.devnum.off },
+ { name: '待机', value: store.devnum.wait },
+ ]
+})
let dev_caijian_title = ['设备名称', '设备编码', '稼动率', '状态']
let dev_tuoxie_title = ['设备编码', '稼动率', '状态']
@@ -256,6 +259,7 @@ h2 {
justify-content: space-between;
align-items: center;
}
+
.left-tip-type-item {
width: 33%;
height: 100%;
@@ -264,26 +268,33 @@ h2 {
justify-content: space-between;
align-items: center;
}
+
.yuan {
width: 24px;
height: 24px;
border-radius: 50%;
}
+
.green {
background-color: #7CFFB2;
}
+
.yello {
background-color: #FDDD60;
}
+
.red {
background-color: #FF6E76;
}
+
.blue {
color: #20AEC5;
}
+
.err {
color: #FF6E76;
}
+
.right-tip-type {
position: absolute;
top: 15px;
@@ -294,6 +305,7 @@ h2 {
justify-content: space-between;
align-items: center;
}
+
.right-tip-type-item {
width: 58px;
height: 100%;
@@ -302,7 +314,7 @@ h2 {
justify-content: space-between;
align-items: center;
}
+
.gatway {
font-size: 36px;
-}
-
+}