调整

src/store/actions.ts

@@ -291,7 +291,7 @@ export default {
     const { content } = (
       await ajax.get({
         url: api.GET_ECOLOGY_POINTS,
-        params: { labelName: name },
+        params: { labelName: name, pageSize: 1000 },
       })
     ).data
     commit('SET_ECOLOGY_POINTS', content)

src/view/components/search-view.vue

@@ -128,6 +128,24 @@ export default defineComponent({
       ).data
       return content
     }
+    const searchHoc = async (id: string) => {
+      const { content } = (
+        await ajax.get({
+          url: api.GET_INDUSTRY_AUTHORITY,
+          params: { hocId: id },
+        })
+      ).data
+      return content
+    }
+    const searchHocMember = async (id: string) => {
+      const { content } = (
+        await ajax.get({
+          url: api.GET_HOC_MEMBER,
+          params: { hocId: id },
+        })
+      ).data
+      return content
+    }
     const handleSearch = async () => {
       const address = searchKey.value
       switch (searchType.value) {
@@ -217,19 +235,9 @@ export default defineComponent({
           }
           const hocId = communityInfo.value && communityInfo.value.hocId
           if (hocId) {
-            const { content } = (
-              await ajax.get({
-                url: api.GET_INDUSTRY_AUTHORITY,
-                params: { hocId },
-              })
-            ).data
+            const content = await searchHoc(hocId)
             communityInfo.value.hocInfo = (content && content[0]) || {}
-            const { content: memberList } = (
-              await ajax.get({
-                url: api.GET_HOC_MEMBER,
-                params: { hocId },
-              })
-            ).data
+            const memberList = await searchHocMember(hocId)
             communityInfo.value.hocInfo.memberList = memberList || []
           } else {
             communityInfo.value.hocInfo = {}
@@ -271,19 +279,9 @@ export default defineComponent({
       }
       const hocId = communityInfo.value && communityInfo.value.hocId
       if (hocId) {
-        const { content } = (
-          await ajax.get({
-            url: api.GET_INDUSTRY_AUTHORITY,
-            params: { hocId },
-          })
-        ).data
+        const content = await searchHoc(hocId)
         communityInfo.value.hocInfo = (content && content[0]) || {}
-        const { content: memberList } = (
-          await ajax.get({
-            url: api.GET_HOC_MEMBER,
-            params: { hocId },
-          })
-        ).data
+        const memberList = await searchHocMember(hocId)
         communityInfo.value.hocInfo.memberList = memberList || []
       } else {
         communityInfo.value.hocInfo = {}

src/view/right/beauty-home-in-station.vue

@@ -15,12 +15,6 @@
         </div>
       </div>
       <m-sub2 :addition="{ value: 33, unit: '幢' }">电梯加装（排摸）</m-sub2>
-      <!-- <div v-if="curViewType === 'street'" class="sum-card">
-        <div v-for="item in elevList" :key="item.name">
-          <m-count class="count" :value="item.value" />
-          <p>{{ item.name }}</p>
-        </div>
-      </div> -->
       <m-sub2>马桶改造</m-sub2>
       <Brief :list="toiletSituation" color="#fff" />
       <m-progress
@@ -59,26 +53,10 @@ export default defineComponent({
       { name: '充电桩', value: 64, icon: icon33 },
       { name: '雨污混接', value: 18, icon: icon34 },
     ])
-    const elevList = ref([
-      { name: '振兴', value: 9 },
-      { name: '福海', value: 5 },
-      { name: '江阴', value: 7 },
-      { name: '定兴', value: 1 },
-      { name: '新昌', value: 5 },
-      { name: '小花园', value: 5 },
-      { name: '顺天村', value: 1 },
-    ])
     const toiletSituation = ref<BriefProp[]>([
       { name: '已完成改造', value: 26, icon: icon35 },
       { name: '应改造', value: 64, icon: icon36 },
     ])
-    const workStationProjects = ref([
-      { name: '架空线梳理', value: 16 },
-      { name: '店招店牌美化', value: 26 },
-      { name: '绿化整治', value: 15 },
-      { name: '外立面整治', value: 8 },
-      { name: '公共设置', value: 8 },
-    ])
     const barData = {
       dimensions: [
         { name: 'name', displayName: '类型' },
@@ -114,9 +92,7 @@ export default defineComponent({
       curViewType,
       summary,
       situation,
-      elevList,
       toiletSituation,
-      workStationProjects,
       barData,
       chartOption,
     }

src/view/right/beauty-home.vue

@@ -24,6 +24,7 @@
       <m-sub2>马桶改造</m-sub2>
       <Brief :list="toiletSituation" color="#fff" />
       <m-progress
+        v-if="show"
         :value="
           Math.round(
             (toiletSituation[0].value / toiletSituation[1].value) * 100
@@ -59,6 +60,7 @@ export default defineComponent({
   name: 'BeautyHome',
   components: { Brief },
   setup() {
+    const show = computed(() => store.state.curTheme === 'service')
     const summary = ref([
       { name: '2020年', value: 26 },
       { name: '2019年', value: 24 },
@@ -79,7 +81,10 @@ export default defineComponent({
       if (!curCmtName.value) return
 
       const { content } = (
-        await ajax.get({ url: api.GET_ELEV_LIST, params: { cmtName: name } })
+        await ajax.get({
+          url: api.GET_ELEV_LIST,
+          params: { cmtName: name, pageSize: 1000 },
+        })
       ).data
       // TODO 可能要出列表或者地图撒点之类的
       console.log(`美丽街区-加装电梯-${name}区域电梯列表`, content)
@@ -101,6 +106,7 @@ export default defineComponent({
       { name: '公共设置', value: 8 },
     ])
     return {
+      show,
       summary,
       situation,
       elevList,

src/view/right/case-analysis.vue

@@ -36,6 +36,7 @@
           </div>
         </div>
       </div>
+      <m-empty v-else />
     </div>
   </m-card>
 </template>

src/view/right/complain.vue

@@ -18,18 +18,26 @@
           </div>
           <m-sub2>分类排行</m-sub2>
           <div class="chart wrapper">
-            <div>
-              <p v-for="item in classChartData.dimensions" :key="item.name">
-                {{ item.displayName }}
-                <m-count
-                  class="count"
-                  :value="classChartData.source[0][item.name]"
-                />
-              </p>
-            </div>
-            <div v-if="showChart">
-              <m-radar :dataset="classChartData" :option="chartOption2" />
-            </div>
+            <template
+              v-if="
+                classChartData.dimensions &&
+                  classChartData.dimensions.length > 0
+              "
+            >
+              <div>
+                <p v-for="item in classChartData.dimensions" :key="item.name">
+                  {{ item.displayName }}
+                  <m-count
+                    class="count"
+                    :value="classChartData.source[0][item.name]"
+                  />
+                </p>
+              </div>
+              <div v-if="showChart">
+                <m-radar :dataset="classChartData" :option="chartOption2" />
+              </div>
+            </template>
+            <m-empty v-else style="width: 100%" />
           </div>
         </div>
       </div>

src/view/right/duty-analysis.vue

@@ -14,12 +14,12 @@
       </div>
     </div>
     <div>
-      <div v-if="showChart" class="duty-type">
-        <div v-for="item in mock" :key="item.name">
+      <div v-if="rankType.length > 0" class="duty-type">
+        <div v-for="item in rankType" :key="item.name">
           <div class="circle">
             <Circle
               class="circle-item"
-              :value="+item.rate"
+              :value="+item.value"
               :stroke-width="8"
               :color="['#F7933E', 'rgba(253,211,116,.9)']"
               :rate="2.4"
@@ -27,23 +27,8 @@
           </div>
           <p>{{ item.name }}</p>
         </div>
-        <!-- <div v-if="showChart && pieData.source.length > 0" class="chart">
-          <m-pie :dataset="pieData" :option="pieOption" />
-        </div>
-        <m-empty v-else />
-        <div class="legend">
-          <div v-for="(item, i) in pieData.source" :key="item.name">
-            <p>
-              <span :style="{ background: pieOption.color[i] }" />
-              {{ item.name }}
-            </p>
-            <p>
-              {{ Math.ceil((item.value / total) * 100).toFixed(0) }}%
-              <m-count :value="item.value" />件
-            </p>
-          </div>
-        </div> -->
       </div>
+      <m-empty v-else />
     </div>
     <div class="rank">
       <m-sub2>分类排行</m-sub2>
@@ -203,53 +188,26 @@ export default defineComponent({
       })),
     }))
 
-    const pieData = computed(() => {
+    const rankType = computed(() => {
       const data = store.state.dutyRank[curOption.value] || []
-      return {
-        dimensions: [
-          { name: 'name', displayName: '类型' },
-          { name: 'value', displayName: '数量' },
-        ],
-        source: data.map((item: any) => ({
+      if (data.length === 0) return []
+      const total = data.reduce((acc, cur) => acc + cur.num, 0)
+      return data.map((item: any) => {
+        return {
           name: item.businsessType,
-          value: item.num,
-        })),
-      }
-    })
-    const total = computed(() => {
-      if (!pieData.value.source) return 0
-      return pieData.value.source.reduce((acc, cur) => acc + cur.value, 0)
-    })
-    const pieOption = ref({
-      color: ['#00BFFF', '#FFCE34', '#826AFA', '#589C20', '#F47C1F'],
-      legend: { show: false },
-      series: [
-        {
-          type: 'pie',
-          radius: [0, '80%'],
-          center: ['40%', '50%'],
-          label: {
-            show: false,
-          },
-        },
-      ],
+          value: +Math.ceil((item.num / total) * 100).toFixed(0),
+        }
+      })
     })
     return {
-      mock: [
-        { name: '事件类型1', value: 3110, rate: 62 },
-        { name: '事件类型2', value: 3110, rate: 62 },
-        { name: '事件类型3', value: 3110, rate: 62 },
-      ],
+      rankType,
       showChart,
-      total,
       options,
       curOption,
       rankList,
       placeList,
       barData,
       barOption,
-      pieData,
-      pieOption,
     }
   },
 })

src/view/right/ecology.vue

@@ -138,7 +138,11 @@ export default defineComponent({
     const photos2 = computed(() =>
       photosList.value.filter((e) => e.buildingType.includes('文保'))
     )
-    const getPoints = (name: string) => store.dispatch('getEcologyPoints', name)
+    const getPoints = (name: string) => {
+      store.dispatch('getEcologyPoints', name)
+      // TODO 撒点
+      console.log(`生态—${name}点位信息：`, store.state.ecologyPoints)
+    }
     return {
       ecologyList,
       sumList,