01-12修改更新

dist/index.html

@@ -6,7 +6,7 @@
   <link rel="icon" href="./favicon.ico" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>南京东路街道</title>
-<script type="module" crossorigin src="./assets/index.f042b6d4.js"></script>
+<script type="module" crossorigin src="./assets/index.02ba1bbd.js"></script>
   <link rel="modulepreload" href="./assets/vendor.0a2bc783.js">
   <link rel="stylesheet" href="./assets/index.65e0a3c6.css">
 </head>

src/store/actions.ts

@@ -695,7 +695,31 @@ export default {
       })
     ).data
     commit('SET_WORKSTATION', content)
-    commit('SET_WORKSTATION_PIEDATA', content[0].statistical)
+    const result = {
+      oneDisposalNum: 0,
+      oneNum: 0,
+      twoDisposalNum: 0,
+      twoNum: 0,
+      threeDisposalNum: 0,
+      threeNum: 0,
+    }
+    ;(content || []).forEach((item: any) => {
+      const {
+        oneDisposalNum = 0,
+        oneNum = 0,
+        twoDisposalNum = 0,
+        twoNum = 0,
+        threeDisposalNum = 0,
+        threeNum = 0,
+      } = item?.statistical || {}
+      result.oneDisposalNum += oneDisposalNum
+      result.oneNum += oneNum
+      result.twoDisposalNum += twoDisposalNum
+      result.twoNum += twoNum
+      result.threeDisposalNum += threeDisposalNum
+      result.threeNum += threeNum
+    })
+    commit('SET_WORKSTATION_PIEDATA', result)
   },
   async GET_TRACKEVENT(
     { commit }: Method,

src/view/new-community/community-video.vue

@@ -124,7 +124,6 @@ export default defineComponent({
             }
           })
           videoList.value = [...list.value]
-          console.log(videoList.value)
         })
       })
     const curScene = ref('all')

src/view/new-community/left.vue

@@ -136,6 +136,7 @@ import type { PropType } from 'vue'
 import store from '@/store'
 import Brief from '../components/brief.vue'
 import { ajax, api } from '@/ajax'
+import dayjs from 'dayjs'
 
 const emit = defineEmit(['select'])
 const props = defineProps({
@@ -171,7 +172,7 @@ const pieData1 = computed(() => {
   const { stKindList = [] } = communityInfo.value
   const data1 = stKindList.find((e: any) => e.stKindName?.includes('商品房'))
   const data2 = stKindList.find((e: any) => e.stKindName?.includes('售后房'))
-  const data3 = stKindList.find((e: any) => e.stKindName?.includes('直管公房'))
+  const data3 = stKindList.find((e: any) => e.stKindName?.includes('公房'))
   return {
     dimensions: [
       { name: 'name', displayName: '类型' },
@@ -189,7 +190,7 @@ const pieData1 = computed(() => {
         value: +data2?.stCnstArea.toFixed(2) || 0,
       },
       {
-        name: '直管公房',
+        name: '公房',
         unit: data3?.totUnits || 0,
         value: +data3?.stCnstArea.toFixed(2) || 0,
       },
@@ -284,13 +285,13 @@ const scoreData = ref({
     { name: 'value', displayName: '分数' },
   ],
   source: [
-    { name: '11-01', value: 70 },
-    { name: '11-02', value: 60 },
-    { name: '11-03', value: 90 },
-    { name: '11-04', value: 85 },
-    { name: '11-05', value: 80 },
-    { name: '11-06', value: 70 },
-    { name: '11-07', value: 90 },
+    { name: dayjs().subtract(7, 'days').format('MM-DD'), value: 90 },
+    { name: dayjs().subtract(6, 'days').format('MM-DD'), value: 70 },
+    { name: dayjs().subtract(5, 'days').format('MM-DD'), value: 80 },
+    { name: dayjs().subtract(4, 'days').format('MM-DD'), value: 90 },
+    { name: dayjs().subtract(3, 'days').format('MM-DD'), value: 85 },
+    { name: dayjs().subtract(2, 'days').format('MM-DD'), value: 80 },
+    { name: dayjs().subtract(1, 'days').format('MM-DD'), value: 90 },
   ],
 })
 const option3 = {

src/view/new-community/warning-statistics.vue

@@ -173,7 +173,7 @@ const list = ref([
   { name: '垃圾暴露', value: 0 },
   { name: '占用消防通道', value: 0 },
   { name: '垃圾满溢', value: 0 },
-  { name: '高叠隐患', value: 0 },
+  { name: '高抛隐患', value: 0 },
   // { name: '易积水预警', value: 0 },
   { name: '群租', value: 0 },
 ])
@@ -193,7 +193,7 @@ ajax
       { name: '垃圾暴露', value: 0 },
       { name: '占用消防通道', value: fire },
       { name: '垃圾满溢', value: overflowingGarbage },
-      { name: '高叠隐患', value: 0 },
+      { name: '高抛隐患', value: 0 },
       { name: '群租', value: groupRent },
     ]
   })

src/view/right/demand.vue

@@ -138,16 +138,16 @@ export default defineComponent({
           value: stageCase.value.dispatchNum || 0,
         },
         {
-          name: '结案',
-          value: stageCase.value.endNum || 0,
+          name: '处置',
+          value: stageCase.value.disposalNum || 0,
         },
         {
           name: '检查',
           value: stageCase.value.checkNum || 0,
         },
         {
-          name: '处置',
-          value: stageCase.value.disposalNum || 0,
+          name: '结案',
+          value: stageCase.value.endNum || 0,
         },
       ]
     })
@@ -155,11 +155,19 @@ export default defineComponent({
       if (workstationKind.value[0]) {
         const source: { date: any; data1: any; data2: any; data3: any }[] = []
         workstationKind.value.forEach((element: any, index: number) => {
+          const {
+            oneDisposalNum = 0,
+            oneNum = 0,
+            twoDisposalNum = 0,
+            twoNum = 0,
+            threeDisposalNum = 0,
+            threeNum = 0,
+          } = workstationKind.value[index]?.statistical || {}
           source.unshift({
             date: workstationKind.value[index].date,
-            data1: workstationKind.value[index].statistical.oneDisposalNum,
-            data2: workstationKind.value[index].statistical.twoDisposalNum,
-            data3: workstationKind.value[index].statistical.threeDisposalNum,
+            data1: +oneNum + +twoNum + +threeNum,
+            data2: +oneDisposalNum + +twoDisposalNum + +threeDisposalNum,
+            data3: 0,
           })
         })
         return {

src/view/right/old.vue

@@ -5,7 +5,7 @@
       <div class="sum">
         <div v-for="item in oldSum" :key="item.name">
           <p class="count orange-count">
-            <m-count :value="item.value" :decimal="1" />%
+            <m-count :value="item.value" :decimal="2" />%
           </p>
           <span>{{ item.name }}</span>
         </div>
@@ -201,10 +201,11 @@ export default defineComponent({
         { name: '65-69岁', value: data?.num65_69 || 0 },
         { name: '60-64岁', value: data?.num60_64 || 0 },
       ]
-      const keys = ['gulao', 'duju', 'chunlao', 'dibao', 'canji', 'youfu']
-      const total =
-        keys.map((key) => data[key] || 0).reduce((acc, cur) => acc + cur, 0) ||
-        1
+      // const keys = ['gulao', 'duju', 'chunlao', 'dibao', 'canji', 'youfu']
+      // const total =
+      //   keys.map((key) => data[key] || 0).reduce((acc, cur) => acc + cur, 0) ||
+      //   1
+      const total = 35756
       oldType.value = [
         {
           name: '孤老',

src/view/right/population.vue

 <template>
   <m-card title="实有人口">
     <!-- <m-sub2 :addition="{ value: truePeople.personnelNum }"> 人口数量 </m-sub2> -->
-    <m-sub2 :addition="{ value: 76618 }"> 人口数量 </m-sub2>
+    <m-sub2 :addition="{ value: 44450 }"> 人口数量 </m-sub2>
     <Brief :list="summary" color="#fff" />
     <div class="content">
       <div v-for="item in population" :key="item.name">
@@ -28,7 +28,7 @@ export default defineComponent({
   setup() {
     const summary = computed(() => {
       return [
-        { name: '本市户籍', value: 95718, icon: inImg },
+        { name: '本市户籍', value: 88861, icon: inImg },
         { name: '境外流入', value: 2833, icon: out },
         { name: '境内流入', value: 29052, icon: china },
       ]