1

src/views/statistics/components/sceneEchart.vue

@@ -22,9 +22,11 @@
   const kkList = ref<number[]>([]);
   const ssList = ref<number[]>([]);
   const ssobjList = ref<number[]>([]);
+  const sgList = ref<number[]>([]);
+  const sgobjList = ref<number[]>([]);
   const yixStringData = ref<string[]>([]);
   const echartTypr = ref('line')
-  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','深时obj']);
+  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','深时obj','深光场景','深光obj']);
   const maxSize = ref(0);
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
@@ -37,9 +39,11 @@
     let fields  = {
     'time':'日期',
     'kj':'看见场景',
-    'kk':'看看场景',
+    // 'kk':'看看场景',
     'ss':'深时场景',
     'dy':'深时obj',
+    'sg':'深光场景',
+    'sgdy':'深光obj',
     }
     if('场景趋势分析' == fileTile){
       fileTile = `${val && val.value == 0?'新增':'累计'}`+fileTile
@@ -48,9 +52,11 @@
       return {
         'time':ele,
         'kj':kjList.value && kjList.value[index] || 0,
-        'kk':kkList.value && kkList.value[index] || 0,
+        // 'kk':kkList.value && kkList.value[index] || 0,
         'ss':ssList.value && ssList.value[index] || 0,
         'dy':ssobjList.value && ssobjList.value[index] || 0,
+        'sg':sgList.value && sgList.value[index] || 0,
+        'sgdy':sgobjList.value && sgobjList.value[index] || 0,
       }
     })
     exportElsxFile(data,fields,fileTile)
@@ -82,20 +88,20 @@
         splitNumber: 4,
       },
       series: [
-          {
+        {
           data: kjList.value,
           type: echartTypr.value,
           itemStyle: { color: '#38a0ff' },
           barMaxWidth: 80,
           name: nameList.value[0],
         },
-        {
-          data: kkList.value,
-          type: echartTypr.value,
-          itemStyle: { color: '#4cca73' },
-          barMaxWidth: 80,
-          name: nameList.value[1],
-        },
+        // {
+        //   data: kkList.value,
+        //   type: echartTypr.value,
+        //   itemStyle: { color: '#4cca73' },
+        //   barMaxWidth: 80,
+        //   name: nameList.value[1],
+        // },
         {
           data: ssList.value,
           type: echartTypr.value,
@@ -110,6 +116,20 @@
           barMaxWidth: 80,
           name: nameList.value[3],
         },
+        {
+          data: sgList.value,
+          type: echartTypr.value,
+          itemStyle: { color: '#55d187' },
+          barMaxWidth: 80,
+          name: nameList.value[4],
+        },
+        {
+          data: sgobjList.value,
+          type: echartTypr.value,
+          itemStyle: { color: '#faa19d' },
+          barMaxWidth: 80,
+          name: nameList.value[5],
+        },
       ],
     });
   }
@@ -120,6 +140,8 @@
       kkList.value = echartData.kkList ||[]
       ssList.value = echartData.ssList ||[]
       ssobjList.value = echartData.ssobjList ||[]
+      sgList.value = echartData.sgList ||[]
+      sgobjList.value = echartData.sgobjList ||[]
       yixStringData.value = echartData.xdata ||[]
       if(echartData.nameList){
         nameList.value = echartData.nameList

src/views/statistics/scene/index.vue

@@ -10,88 +10,91 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted, reactive } from 'vue';
-import { sceneTotal, sceneTrend } from '/@/api/statistics/index';
-import { GrowCardItem } from '../data';
-import GrowCard from '../components/GrowCard.vue';
-import sceneEchart from '../components/sceneEchart.vue';
-const loading = ref(true);
-const growCardList = ref<GrowCardItem[]>([]);
-const echartData = reactive({
-  xdata: [],
-  kjList:[],
-  kkList:[],
-  ssList:[],
-  ssobjList:[],
-});
-const SearchData = reactive({
-  startTime: '',
-  endTime: '',
-  dataType: 0,
-  type: 2,
-});
-onMounted(() => {
-  getData();
-  getList();
-});
-async function getList() {
-  let downlist = [],
-    xdata = [];
-  const {kjList,kkList,ssList,ssobjList} = await sceneTrend(SearchData);
-  kjList.map((ele) => {
-    xdata.push(ele.groupKey);
-    downlist.push(ele.count);
+  import { ref, onMounted, reactive } from 'vue';
+  import { sceneTotal, sceneTrend } from '/@/api/statistics/index';
+  import { GrowCardItem } from '../data';
+  import GrowCard from '../components/GrowCard.vue';
+  import sceneEchart from '../components/sceneEchart.vue';
+  const loading = ref(true);
+  const growCardList = ref<GrowCardItem[]>([]);
+  const echartData = reactive({
+    xdata: [],
+    kjList: [],
+    kkList: [],
+    ssList: [],
+    ssobjList: [],
+    sgList: [],
+    sgobjList: [],
   });
-  echartData.xdata = xdata;
-  echartData.kjList = downlist
-  echartData.kkList = kkList.map(ele => ele.count)
-  echartData.ssList = ssList &&ssList.map(ele => ele.count)|| []
-  echartData.ssobjList = ssobjList.map(ele => ele.count)|| []
-}
-function Search(val) {
-  const { startTime, endTime, dataType, type } = val;
-  console.log('params', val);
-  SearchData.startTime = startTime;
-  SearchData.endTime = endTime;
-  SearchData.dataType = type;
-  SearchData.type = dataType;
-  getList();
-}
-async function getData() {
-  try {
-    loading.value = true;
-    const { totalSceneCount = 0, preMonthAddCount = 0, todayAddCount = 0 } = await sceneTotal();
-    let list: GrowCardItem[] = [
-      {
-        title: '累计场景数量',
-        icon: 'fxemoji:notchedrightsemi3dot',
-        value: totalSceneCount,
-        unit: '个',
-        color: 'green',
-        action: '年',
-      },
-      {
-        title: '上月新增场景数量',
-        icon: 'download-count|svg',
-        value: preMonthAddCount,
-        unit: '个',
-        color: 'blue',
-        action: '月',
-      },
-      {
-        title: '今日新增场景数量',
-        icon: 'transaction|svg',
-        value: todayAddCount,
-        unit: '个',
-        color: 'orange',
-        action: '日',
-      },
-    ];
-    loading.value = false;
-    growCardList.value = list;
-  } catch (error) {
-    loading.value = false;
+  const SearchData = reactive({
+    startTime: '',
+    endTime: '',
+    dataType: 0,
+    type: 2,
+  });
+  onMounted(() => {
+    getData();
+    getList();
+  });
+  async function getList() {
+    let downlist = [],
+      xdata = [];
+    const { kjList, kkList, ssList, ssobjList, sgList, sgobjList } = await sceneTrend(SearchData);
+    kjList.map((ele) => {
+      xdata.push(ele.groupKey);
+      downlist.push(ele.count);
+    });
+    echartData.xdata = xdata;
+    echartData.kjList = downlist;
+    echartData.kkList = kkList.map((ele) => ele.count);
+    echartData.ssList = (ssList && ssList.map((ele) => ele.count)) || [];
+    echartData.ssobjList = ssobjList.map((ele) => ele.count) || [];
+    echartData.sgList = (sgList && sgList.map((ele) => ele.count)) || [];
+    echartData.sgobjList = sgobjList.map((ele) => ele.count) || [];
+  }
+  function Search(val) {
+    const { startTime, endTime, dataType, type } = val;
+    console.log('params', val);
+    SearchData.startTime = startTime;
+    SearchData.endTime = endTime;
+    SearchData.dataType = type;
+    SearchData.type = dataType;
+    getList();
+  }
+  async function getData() {
+    try {
+      loading.value = true;
+      const { totalSceneCount = 0, preMonthAddCount = 0, todayAddCount = 0 } = await sceneTotal();
+      let list: GrowCardItem[] = [
+        {
+          title: '累计场景数量',
+          icon: 'fxemoji:notchedrightsemi3dot',
+          value: totalSceneCount,
+          unit: '个',
+          color: 'green',
+          action: '年',
+        },
+        {
+          title: '上月新增场景数量',
+          icon: 'download-count|svg',
+          value: preMonthAddCount,
+          unit: '个',
+          color: 'blue',
+          action: '月',
+        },
+        {
+          title: '今日新增场景数量',
+          icon: 'transaction|svg',
+          value: todayAddCount,
+          unit: '个',
+          color: 'orange',
+          action: '日',
+        },
+      ];
+      loading.value = false;
+      growCardList.value = list;
+    } catch (error) {
+      loading.value = false;
+    }
   }
-}
 </script>
-