diff --git a/src/views/visualization/MapModal.vue b/src/views/visualization/MapModal.vue index e7ee807b..5a05f4a1 100644 --- a/src/views/visualization/MapModal.vue +++ b/src/views/visualization/MapModal.vue @@ -53,7 +53,7 @@ :index="index" /> -
+
+
+ +
@@ -99,6 +107,7 @@ import QXSZ from './components/QXSZ.vue' import SZJCSJ from './components/SZJCSJ.vue' import TRJCSJ from './components/TRJCSJ.vue' + import JK from './components/JK.vue' import BasicChart from './components/BasicChart.vue' import { useVisualizationStore } from '/@/store/modules/visualization' import { getAgriculturalBasicDetails } from '/@/api/sys/other' @@ -111,6 +120,7 @@ QXSZ, SZJCSJ, TRJCSJ, + JK, BasicChart, }, props: { @@ -136,10 +146,13 @@ const cropsList = ref([]) const deviceList = ref([]) - const isJK = computed(() => deviceList.value.findIndex((e) => e.type == '监控设备') >= 0) + const isJK = computed( + () => deviceList.value.findIndex((e) => e.type == '监控设备' && e.is_recommend == 1) >= 0, + ) const isTR = computed(() => deviceList.value.findIndex((e) => e.type == '土壤设备') >= 0) const isQX = computed(() => deviceList.value.findIndex((e) => e.type == '气象设备') >= 0) const isSZ = computed(() => deviceList.value.findIndex((e) => e.type == '水质设备') >= 0) + const isSB = computed(() => deviceList.value.length) const modelWidth = computed( () => (boxWidth + 10) * Math.ceil((cropsList.value.length + 4) / 2) + 60, @@ -149,6 +162,8 @@ const resData = await getAgriculturalBasicDetails(props.baseId) cropsList.value = resData.crops deviceList.value = resData.devices + console.log(resData.devices) + Data.data = resData } const year = computed(() => visualizationStore.getYear) @@ -184,6 +199,7 @@ isTR, isQX, isSZ, + isSB, getContainer, cropsList, deviceList, diff --git a/src/views/visualization/components/JK.vue b/src/views/visualization/components/JK.vue index f88f4ce6..481558e7 100644 --- a/src/views/visualization/components/JK.vue +++ b/src/views/visualization/components/JK.vue @@ -1,7 +1,7 @@