Merge remote-tracking branch 'origin/master'

src/api/screen/index.ts

@@ -1,6 +1,5 @@
 import request from '@/config/axios'
 
-
 // 数据大屏 API
 export const ScreenApi = {
   // 查询大屏左侧第一个接口
@@ -20,7 +19,6 @@ export const ScreenApi = {
     return await request.get({ url: `/system/big-view-data/getRightFirst`, params })
   },
 
-      
   getRightSecond: async (params: any) => {
     return await request.get({ url: `/system/big-view-data/getRightSecond`, params })
   },
@@ -32,4 +30,7 @@ export const ScreenApi = {
   getRightFourth: async (params: any) => {
     return await request.get({ url: `/system/big-view-data/getRightFourth`, params })
   },
+  getCenter: async (params: any) => {
+    return await request.get({ url: `/system/big-view-data/getCenter`, params })
+  }
 }

src/views/screen/compenonts/leftwrapper.vue

@@ -16,7 +16,6 @@
 import TitleBox from './titleBox.vue'
 import { ScreenApi } from '@/api/screen'
 
-
 const leftWrapperRef = ref()
 
 let observer: Nullable<ResizeObserver> = null
@@ -50,6 +49,9 @@ const row1Options = ref({
   },
   yAxis: {
     type: 'value',
+    max: (v) => {
+      return Math.floor(v.max * 1.1 + 1)
+    },
     axisTick: {
       show: false,
       lineStyle: {
@@ -139,8 +141,7 @@ const row2Options = ref({
   series: [
     {
       type: 'pie',
-      itemStyle: {
+      itemStyle: {},
-      },
       radius: ['55%', '75%'],
       center: ['50%', '50%'],
       label: {
@@ -313,31 +314,37 @@ const handlerResize = () => {
   unref(row3Chart).resizeHandler()
 }
 
-const queryParams:any = ref();
+const queryParams: any = ref()
-
-
 
 //左一数据
 const leftFirst = async () => {
-  const data:any = await ScreenApi.getLeftFirst(queryParams.value);
+  const data: any = await ScreenApi.getLeftFirst(queryParams.value)
-  row1Options.value.xAxis.data = data.map(i=>i.name)
+  row1Options.value.xAxis.data = data.map((i) => i.name)
-  row1Options.value.series[0].data = data.map(i=>i.value)
+  row1Options.value.series[0].data = data.map((i) => i.value)
+  row1Options.value.series[1].data = data.map((i) => i.value)
 }
 
 //左二数据
 const leftSecond = async () => {
-  const data = await ScreenApi.getLeftSecond(queryParams.value);
+  const data = await ScreenApi.getLeftSecond(queryParams.value)
   row2Options.value.title.text = data.enterpriseCount
   row2Options.value.series[0].data = data.enterpriseCountGroup
 }
 
 //左三数据
 const leftThird = async () => {
-  const data = await ScreenApi.getLeftThird(queryParams.value);
+  const data = await ScreenApi.getLeftThird(queryParams.value)
-  row3Options.value.yAxis[0].data = data.map(i=>i.name)
+  row3Options.value.yAxis[0].data = data.map((i) => i.name)
-  row3Options.value.yAxis[1].data = data.map(i=>i.finishCount)
+  row3Options.value.yAxis[1].data = data.map((i) => i.execCount)
+  row3Options.value.series[1].data = data.map((i) => i.finishCount)
+  row3Options.value.series[2].data = data.map((i) => {
+    return {
+      name: i.name,
+      value: i.finishCount,
+      symbolSize: !i.finishCount ? 0 : [10, 15]
+    }
+  })
 }
-
 
 onMounted(() => {
   leftFirst()

src/views/screen/compenonts/map.vue

@@ -17,8 +17,8 @@ import Weather from './weather.vue'
 import Numbox from './numbox.vue'
 import Tabber from './tabber.vue'
 import Norm from './norm.vue'
-let observer: Nullable<ResizeObserver> = null
 
+let observer: Nullable<ResizeObserver> = null
 const mapWrapperRef = ref()
 
 const mapChartRef = ref()
@@ -92,6 +92,8 @@ const handlerResize = () => {
   unref(mapChartRef).resizeHandler()
 }
 
+
+
 onMounted(() => {
   observer = new ResizeObserver(handlerResize)
   observer.observe(mapWrapperRef.value)

src/views/screen/compenonts/numbox.vue

@@ -1,4 +1,16 @@
 <script setup lang="ts">
+import { ScreenApi } from '@/api/screen'
+const centerInfo: any = ref({
+  taskCount: 0,
+  inspectionsCount: 0,
+  enterpriseCount: 0
+})
+
+const getCenter = async () => {
+  centerInfo.value = await ScreenApi.getCenter({})
+}
+
+getCenter()
 </script>
 
 <template>
@@ -7,7 +19,7 @@
       <section>任务数</section>
       <count-to
         :start-val="0"
-        :end-val="1000"
+        :end-val="centerInfo.taskCount"
         :duration="2000"
         :options="{ decimal: 2 }"
         suffix="+"
@@ -18,7 +30,7 @@
       <section>执法数</section>
       <count-to
         :start-val="0"
-				  :end-val="1000"
+        :end-val="centerInfo.inspectionsCount"
         :duration="2000"
         :options="{ decimal: 2 }"
         suffix="+"
@@ -29,7 +41,7 @@
       <section>企业数</section>
       <count-to
         :start-val="0"
-				  :end-val="100"
+        :end-val="centerInfo.enterpriseCount"
         :duration="2000"
         :options="{ decimal: 2 }"
         suffix="+"

src/views/screen/compenonts/rightwrapper.vue

@@ -7,7 +7,21 @@
       <Charts :options="row2Options" ref="row2Chart" />
     </TitleBox>
     <TitleBox title="资质许可状态">
-      <section></section>
+      <section class="height-100% width-100% flex flex-col gap-12px">
+        <section class="flex justify-between font-size-14px" v-for="(row, index) in list" :key="index">
+          <span>{{ row.name }}</span>
+          <section class="color-#56CA00">
+            逾期
+            <count-to
+              :start-val="0"
+              :end-val="row.count"
+              :duration="1000"
+              :options="{ separator: ',', decimal: 0 }"
+            />
+            天
+          </section>
+        </section>
+      </section>
     </TitleBox>
     <TitleBox>
       <Charts :options="row3Options" ref="row3Chart" />
@@ -58,6 +72,9 @@ const row1Options = ref({
           color: '#fff'
         }
       },
+      max: (v) => {
+        return Math.floor(v.max * 1.1 + 1)
+      },
       axisLabel: {
         show: false
       },
@@ -76,6 +93,9 @@ const row1Options = ref({
           color: '#fff'
         }
       },
+      max: (v) => {
+        return Math.floor(v.max * 1.1 + 1)
+      },
       axisLabel: {
         show: false
       },
@@ -154,7 +174,7 @@ const row1Options = ref({
     }
   }
 })
-
+const list: any = ref([])
 const color = ['#56CA00', '#FFE700', '#16B1FF']
 const row2Options = ref({
   series: [
@@ -262,6 +282,9 @@ const row3Options=ref({
           color: '#fff'
         }
       },
+      max: (v) => {
+        return Math.floor(v.max * 1.1 + 1)
+      },
       axisLabel: {
         show: false
       },
@@ -280,6 +303,9 @@ const row3Options=ref({
           color: '#fff'
         }
       },
+      max: (v) => {
+        return Math.floor(v.max * 1.1 + 1)
+      },
       axisLabel: {
         show: false
       },
@@ -320,7 +346,7 @@ const row3Options=ref({
             }
           ]
         }
-			},
+      }
     },
     {
       name: '任务数量',
@@ -387,31 +413,49 @@ const queryParams:any = ref()
 
 //右一数据
 const rightFirst = async () => {
-  const data:any = await ScreenApi.getRightFirst(queryParams.value);
+  const data: any = await ScreenApi.getRightFirst(queryParams.value)
-  row1Options.value.xAxis.data = data.map(i=>i.name)
+  row1Options.value.xAxis.data = data.map((i) => i.name)
-  row1Options.value.series[0].data = data.map(i=>i.value)
+  row1Options.value.series[0].data = data.map((i) => i.value)
-  row1Options.value.series[1].data = data.map(i=>i.taskValue)
+  row1Options.value.series[1].data = data.map((i) => i.taskValue)
 }
 
 //右二数据
 const rightSecond = async () => {
-  const data = await ScreenApi.getRightSecond(queryParams.value);
+  const data = await ScreenApi.getRightSecond(queryParams.value)
-  row2Options.value.series[0].data = data
+  row2Options.value.series[0].data = data.map((i, index) => {
+    return {
+      value: i.value,
+      name: i.name,
+      itemStyle: {
+        color: color[index]
+      }
+    }
+  })
+  row2Options.value.legend.data = data.map((i, index) => {
+    return {
+      name: `${i.name}`,
+      textStyle: {
+        color: color[index]
+      }
+    }
+  })
+  row2Options.value.legend.formatter = (v) => {
+    const count = data.find((d) => v == d.name).value
+    return `${v} ${count}`
+  }
 }
 
 // 右三数据
-// const rightThird = async() => {
+const rightThird = async () => {
-//   const data = await ScreenApi.getRightThird(queryParams.value);
+	list.value = await ScreenApi.getRightThird(queryParams.value)
-//   row3Options.value.yAxis[0].data = data.map(i=>i.name)
+}
-//   row3Options.value.yAxis[1].data = data.map(i=>i.finishCount)
-// }
 // 右四数据
-// const rightFourth = async() => {
+const rightFourth = async () => {
-//   const data = await ScreenApi.getRightFourth(queryParams.value);
+  const data = await ScreenApi.getRightFourth(queryParams.value)
-//   row3Options.value.xAxis[0].data = data.map(i=>i.name)
+  row3Options.value.xAxis.data = data.map((i) => i.name)
-//   row3Options.value.yAxis[1].data = data.map(i=>i.finishCount)
+  row3Options.value.series[0].data = data.map((i) => i.enforcementGrowthRate)
-// }
+  row3Options.value.series[1].data = data.map((i) => i.taskGrowthRate)
-
+}
 
 const handlerResize = () => {
   unref(row1Chart).resizeHandler()
@@ -423,6 +467,8 @@ onMounted(() => {
   initChart()
   rightFirst()
   rightSecond()
+  rightFourth()
+  rightThird()
   observer = new ResizeObserver(handlerResize)
   observer.observe(rightWrapperRef.value)
   handlerResize()