diff --git a/src/assets/images/device.png b/src/assets/images/device.png new file mode 100644 index 0000000..8600497 Binary files /dev/null and b/src/assets/images/device.png differ diff --git a/src/assets/images/qcode.png b/src/assets/images/qcode.png new file mode 100644 index 0000000..6978f20 Binary files /dev/null and b/src/assets/images/qcode.png differ diff --git a/src/store/modules/bim.js b/src/store/modules/bim.js index 0851086..c36f36b 100644 --- a/src/store/modules/bim.js +++ b/src/store/modules/bim.js @@ -5,7 +5,8 @@ const bimStore = defineStore( activateIndex: 0, activateTree: {}, activateDevice: {}, - activateApplication: {} + activateApplication: {}, + deviceNum: '' }), actions: { // 菜单 @@ -23,6 +24,10 @@ const bimStore = defineStore( // 应用树选中 setActivateApplicationTree(item) { this.activateApplication = item; + }, + // 资产详情num + setDeviceNum(item) { + this.deviceNum = item; } } }) diff --git a/src/views/bim/bimHome/components/3DChart.js b/src/views/bim/bimHome/components/3DChart.js index d80f77a..ed3f6a5 100644 --- a/src/views/bim/bimHome/components/3DChart.js +++ b/src/views/bim/bimHome/components/3DChart.js @@ -52,7 +52,7 @@ const getPie3D = (pieData, internalDiameterRatio, rateName) => { // const newColor = _.cloneDeep(color) // newColor.splice(0, 1) - const newColor = [color[0], color[1], color[5]] + const newColor = [color[0], color[1], color[5],color[6]] series.push({ type: 'pie', @@ -87,8 +87,8 @@ const getPie3D = (pieData, internalDiameterRatio, rateName) => { const option = { color: newColor, legend: { - show: false, - color: '#FFFFFF', + show: true, + textStyle: { color: '#ffffff' }, left: 'center', top: 'bottom', itemGap: 20, @@ -121,7 +121,7 @@ const getPie3D = (pieData, internalDiameterRatio, rateName) => { show: true, formatter: params => { if (params.seriesName !== 'mouseoutSeries' && params.seriesName !== 'pie2d') { - console.log(option.series[params.seriesIndex].pieData) + // console.log(option.series[params.seriesIndex].pieData) // let bfb = ((option.series[params.seriesIndex].pieData.endRatio - option.series[params.seriesIndex].pieData.startRatio) * // 100).toFixed(2) // if (bfb === 'NaN') { diff --git a/src/views/bim/bimHome/components/BasicInfo.vue b/src/views/bim/bimHome/components/BasicInfo.vue new file mode 100644 index 0000000..5c3365c --- /dev/null +++ b/src/views/bim/bimHome/components/BasicInfo.vue @@ -0,0 +1,67 @@ + + + \ No newline at end of file diff --git a/src/views/bim/bimHome/components/BuildInfo.vue b/src/views/bim/bimHome/components/BuildInfo.vue index cdd2d34..7e3560d 100644 --- a/src/views/bim/bimHome/components/BuildInfo.vue +++ b/src/views/bim/bimHome/components/BuildInfo.vue @@ -25,16 +25,7 @@ import bimStore from '@/store/modules/bim'; import TopDiv from "./TopDiv.vue"; -const data = reactive({ - buildInfo: { - name: '原料糖化车间一', - area: '5236 ㎡', - status:'启用', - desc: '原料糖化车间一,负责原料糖化,启用于2011年' -} -}); - -const { buildInfo } = toRefs(data); +const buildInfo = computed(() => bimStore().activateTree.info); \ No newline at end of file diff --git a/src/views/bim/bimHome/components/DeviceEvent.vue b/src/views/bim/bimHome/components/DeviceEvent.vue index 8ba3b0f..b2dd3dc 100644 --- a/src/views/bim/bimHome/components/DeviceEvent.vue +++ b/src/views/bim/bimHome/components/DeviceEvent.vue @@ -51,7 +51,7 @@ const data = reactive({ content: '设备保养周期剩余3天', time: '上午', timestamp: '11:46', - color: '#0bbd87', + color: '#31bdb4', icon: MoreFilled, type: 'primary', size: 'large' diff --git a/src/views/bim/bimHome/components/DeviceInfo.vue b/src/views/bim/bimHome/components/DeviceInfo.vue index 02d5513..1ff9557 100644 --- a/src/views/bim/bimHome/components/DeviceInfo.vue +++ b/src/views/bim/bimHome/components/DeviceInfo.vue @@ -4,15 +4,15 @@
名称 - {{ deviceInfo.name }} + {{ deviceInfo && deviceInfo.name }}
类型 - {{ deviceInfo.type }} + {{ deviceInfo && deviceInfo.type }}
状态 - {{ deviceInfo.status }} + {{ deviceInfo && deviceInfo.status }}
@@ -21,14 +21,11 @@ import TopDiv from "./TopDiv.vue"; import bimStore from '@/store/modules/bim'; const data = reactive({ - deviceInfo: { - name: '立仓', - type: '生产设备', - status:'启用', -} + deviceInfo: {} }); const { deviceInfo } = toRefs(data); +watch(() => bimStore().activateDevice.info, value => deviceInfo.value = value); \ No newline at end of file +} \ No newline at end of file diff --git a/src/views/bim/bimHome/components/DeviceInfoDialog.vue b/src/views/bim/bimHome/components/DeviceInfoDialog.vue index 8934329..e8c190d 100644 --- a/src/views/bim/bimHome/components/DeviceInfoDialog.vue +++ b/src/views/bim/bimHome/components/DeviceInfoDialog.vue @@ -1,8 +1,11 @@