diff --git a/src/assets/images/cao.jpg b/src/assets/images/cao.jpg new file mode 100644 index 0000000..4152683 Binary files /dev/null and b/src/assets/images/cao.jpg differ diff --git a/src/assets/images/licang.jpg b/src/assets/images/licang.jpg new file mode 100644 index 0000000..cd5488b Binary files /dev/null and b/src/assets/images/licang.jpg differ diff --git a/src/views/bim/bimHome/components/BasicInfo.vue b/src/views/bim/bimHome/components/BasicInfo.vue index c091456..e47195e 100644 --- a/src/views/bim/bimHome/components/BasicInfo.vue +++ b/src/views/bim/bimHome/components/BasicInfo.vue @@ -11,13 +11,15 @@
- + + 设备图片
\ No newline at end of file diff --git a/src/views/bim/bimHome/index.vue b/src/views/bim/bimHome/index.vue index f3b6fc1..4a9c792 100644 --- a/src/views/bim/bimHome/index.vue +++ b/src/views/bim/bimHome/index.vue @@ -10,13 +10,13 @@ - + - + @@ -56,6 +56,7 @@ import RealInfoDialog from './components/RealInfoDialog.vue'; import DeviceDetial from './components/DeviceDetial.vue'; import bimStore from '@/store/modules/bim'; import { computed } from 'vue'; +import Bus from '@/utils/bus.js'; const data = reactive({ sceneUrl: '/jz/glb/scene.gltf', equimentInfo: {}, @@ -78,6 +79,11 @@ const deviceInfo = computed(() => bimStore().activateTree.deviceInfo ); +Bus.on('viewMore', (title) => { + // Todo + title === '资产信息' ? dialogVisible.value = true : dialogVisible1.value = true;; +}) + const onReady = () => { @@ -110,9 +116,6 @@ const handleApplicationClick = (value) => { const changeMenu = (index) => { } -const openDialog = () => { - dialogVisible.value = true; -} const openDialog1 = () => { dialogVisible1.value = true; diff --git a/src/views/components/Pie.vue b/src/views/components/Pie.vue index 7a5fc3f..ab93342 100644 --- a/src/views/components/Pie.vue +++ b/src/views/components/Pie.vue @@ -23,6 +23,12 @@ const getCharts = () => { dom.removeAttribute('_echarts_instance_') var myChart = echarts.init(dom); var option = { + title: { + text: '资产维修情况', + textStyle: { + color: "#fff", + }, + }, tooltip: { trigger: "item", confine: true, //浮窗限制在图表内 @@ -61,11 +67,12 @@ const getCharts = () => { elements: [ { type: "text", - left: "27%", + left: "16%", top: "middle", style: { - text: total + "\n" + "总数", + text: " " + total + "\n" + "总报修数", fill: "#fff", + fontSize: 24 }, }, ], @@ -78,10 +85,10 @@ const getCharts = () => { itemHeight: 5, orient: "vertical", itemGap: 30, - data: ["数据一"], + data: ["未维修"], formatter: () => { const arr = [ - "{b|" + "数据一" + "}\xa0\xa0\xa0", + "{b|" + "未维修" + "}\xa0\xa0\xa0", "{a|" + wei + "}\xa0\xa0\xa0\xa0", ]; return arr.join(""); @@ -106,10 +113,10 @@ const getCharts = () => { itemHeight: 5, orient: "vertical", itemGap: 30, - data: ["数据二"], + data: ["已维修"], formatter: () => { const arr = [ - "{b|" + "数据二" + "}\xa0\xa0\xa0", + "{b|" + "已维修" + "}\xa0\xa0\xa0", "{a|" + yi + "}\xa0\xa0\xa0\xa0", ]; return arr.join(""); @@ -134,10 +141,10 @@ const getCharts = () => { itemHeight: 5, orient: "vertical", itemGap: 30, - data: ["数据三"], + data: ["维修中"], formatter: () => { const arr = [ - "{b|" + "数据三" + "}\xa0\xa0\xa0", + "{b|" + "维修中" + "}\xa0\xa0\xa0", "{a|" + doing + "}\xa0\xa0\xa0\xa0", ]; return arr.join(""); @@ -178,7 +185,7 @@ const getCharts = () => { data: [ { value: wei, - name: "数据一", + name: "未维修", itemStyle: { borderRadius: 10, color: "#FD2525", @@ -187,7 +194,7 @@ const getCharts = () => { }, { value: yi, - name: "数据二", + name: "已维修", itemStyle: { color: "#1f5189", opacity: 0.6, @@ -195,7 +202,7 @@ const getCharts = () => { }, { value: doing, - name: "数据三", + name: "维修中", itemStyle: { color: "#e7bf69", opacity: 0.8, @@ -221,7 +228,7 @@ const getCharts = () => { data: [ { value: wei, - name: "数据一", + name: "未维修", itemStyle: { color: "#aa2b3d", }, @@ -229,7 +236,7 @@ const getCharts = () => { { value: yi, - name: "数据二", + name: "已维修", itemStyle: { color: "#1f5189", }, @@ -237,7 +244,7 @@ const getCharts = () => { { value: doing, - name: "数据三", + name: "维修中", itemStyle: { color: "#655e64", }, diff --git a/src/views/components/xtBar.vue b/src/views/components/xtBar.vue index c07c322..0a0776c 100644 --- a/src/views/components/xtBar.vue +++ b/src/views/components/xtBar.vue @@ -21,7 +21,10 @@ const getCharts = () => { var myChart = echarts.init(dom); let option = { title: { - text: '' + text: '资产巡检间隔时长', + textStyle: { + color: "#fff", + }, }, tooltip: { trigger: 'axis', @@ -30,6 +33,7 @@ const getCharts = () => { } }, legend: { + bottom: 0, textStyle: { color: "#ffff", fontFamily: "Alibaba PuHuiTi", @@ -40,7 +44,7 @@ const getCharts = () => { grid: { left: '15%', right: '4%', - bottom: '5%' + bottom: '12%' }, xAxis: [ {