快处搜索详情更换接口

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.56be8503.js"></script>
+<script type="module" crossorigin src="./assets/index.8d537ddf.js"></script>
   <link rel="modulepreload" href="./assets/vendor.0a2bc783.js">
   <link rel="stylesheet" href="./assets/index.a96a5e4b.css">
 </head>

src/ajax/api.ts

@@ -142,6 +142,7 @@ export default {
   GET_DISCOVER_COUNT: '/service-special-nandong/public/discover/count', // 今日及历史发现数
   GET_DISCOVER_LIST: '/service-special-nandong/public/discoverys', // 快处闭环
   GET_COMMUNITY_PATH: '/service-special-nandong/public/coordinatess', // 所有小区勾边
+  GET_DISCOVER_DETAIL: '/service-special-nandong/public/discoveryProcesss', // 快处详情
 
   /** 来福士 */
   GET_RAFFLES: '/service-special-nandong/public/lfss', // 来福士列表

src/view/components/search-view.vue

@@ -48,6 +48,7 @@
       :community-info="communityInfo"
       :property-info="propertyInfo"
       :case-info="caseInfo"
+      :detail="disposeDetail"
     />
   </m-drawer>
   <m-drawer v-model="populationModal">
@@ -249,11 +250,21 @@ export default defineComponent({
         propertyInfo.value = {}
       }
       caseModal.value = true
+      disposeModal.value = false
       populationModal.value = false
       communityModal.value = false
     }
+    const disposeDetail = ref<any[]>([])
     async function selectDispose(data: any) {
       caseInfo.value = data
+      ajax
+        .get({
+          url: api.GET_DISCOVER_DETAIL,
+          params: { discoverId: data?.id },
+        })
+        .then((res) => {
+          disposeDetail.value = res?.data?.content || {}
+        })
       if (data.communityId) {
         const content = await searchCommunity(null, data.communityId)
         communityInfo.value = content && content[0]
@@ -267,6 +278,7 @@ export default defineComponent({
         propertyInfo.value = {}
       }
       disposeModal.value = true
+      caseModal.value = false
       populationModal.value = false
       communityModal.value = false
     }
@@ -328,6 +340,7 @@ export default defineComponent({
         buildingInfo.value = {}
       }
       populationModal.value = true
+      disposeModal.value = false
       caseModal.value = false
       communityModal.value = false
     }
@@ -369,6 +382,7 @@ export default defineComponent({
       communityInfo.value.deviceList =
         (await searchDevice({ sectId: data.sectId })) || []
       communityModal.value = true
+      disposeModal.value = false
       populationModal.value = false
       caseModal.value = false
     }
@@ -385,6 +399,7 @@ export default defineComponent({
       communityInfo,
       propertyInfo,
       caseInfo,
+      disposeDetail,
       buildingInfo,
       roomInfo,
       empty,

src/view/drawers/dispose-drawer.vue

@@ -5,7 +5,7 @@
       <m-form
         :template="[
           'stNameFrst:小区名称',
-          'address:小区地址',
+          'address:地址',
           'cmtName:所属居委会',
           'totUnits:总门牌幢数',
           'totHous:总户数',
@@ -35,7 +35,7 @@
         label-width="1.4rem"
       />
     </m-card>
-    <m-card title="案件详情">
+    <m-card title="快处详情">
       <div class="sum">
         <p>{{ caseInfo.buildingAddr }}</p>
         <span
@@ -45,20 +45,27 @@
           <b>{{ transType(caseInfo.category).text }}</b>
         </span>
       </div>
+      <template v-if="details && details.length > 0">
         <div v-for="item in details" :key="item.title" class="step">
           <p class="title">
             <img src="@/assets/images/dot.png" /> {{ item.title }}
           </p>
           <div class="content">
             <p class="sub">{{ item.sub }}</p>
-          <p>{{ item.content || '无' }}</p>
+            <p>{{ item.content }}</p>
             <template v-if="item.imgs && item.imgs.length > 0">
               <template v-for="(img, i) in item.imgs">
-              <img v-if="img" :key="i" :src="'data:image/png;base64,' + img" />
+                <img
+                  v-if="img"
+                  :key="i"
+                  :src="'data:image/png;base64,' + img"
+                />
               </template>
             </template>
           </div>
         </div>
+      </template>
+      <m-empty v-else style="margin-top: 1rem" />
     </m-card>
   </div>
 </template>
@@ -90,6 +97,12 @@ export default defineComponent({
         return {}
       },
     },
+    detail: {
+      type: Object as PropType<{ [key: string]: any }[]>,
+      default: () => {
+        return []
+      },
+    },
   },
   setup(props) {
     const communityData = computed(() => {
@@ -108,31 +121,75 @@ export default defineComponent({
 
       return {
         ...communityInfo,
-        address: caseInfo && caseInfo.address,
+        address: caseInfo && caseInfo.buildingAddr,
         range: range.filter((e) => e !== null).join('，'),
       }
     })
     const details = computed(() => {
-      const { caseInfo } = props
-      if (!caseInfo) return []
-      const result = [
-        {
-          title: '受理',
-          sub: `${caseInfo?.acceptTime} | ${caseInfo?.buildingAddr}`,
-          content: caseInfo?.description,
-          imgs: [caseInfo?.alarmPic],
-        },
-      ]
-      if (caseInfo?.disposalStatus === 'over') {
+      /**
+       * 待处置 pending(0)
+       * 认定 identified(1)
+       * 自行整改 rectification(2)
+       * 联勤联动整治 regulation(3)
+       * 已完结 over(9)
+       */
+      const { detail = [] } = props
+      const pending = detail.find((item) => item.status === 'pending')
+      const identified = detail.find((item) => item.status === 'identified')
+      const rectification = detail.find(
+        (item) => item.status === 'rectification'
+      )
+      const regulation = detail.find((item) => item.status === 'regulation')
+      const over = detail.find((item) => item.status === 'over')
+
+      const result: any[] = []
+      pending &&
         result.push({
-          title: `整治 ${
-            caseInfo.disposalOrg ? '· ' + caseInfo.disposalOrg : ''
-          }`,
-          sub: caseInfo?.disposalTime,
-          content: caseInfo?.disposalDescription,
-          imgs: [caseInfo?.donePic],
+          title:
+            '待处置' +
+            (pending?.disposalOrg ? ' · ' + pending?.disposalOrg : ''),
+          sub: pending?.disposalTime || '',
+          content: pending?.processDescription,
+          imgs: [pending?.processPic],
         })
-      }
+      identified &&
+        result.push({
+          title:
+            '认定' +
+            (identified?.disposalOrg ? ' · ' + identified?.disposalOrg : ''),
+          sub: identified?.disposalTime || '',
+          content: identified?.processDescription,
+          imgs: [identified?.processPic],
+        })
+      rectification &&
+        result.push({
+          title:
+            '自行整改' +
+            (rectification?.disposalOrg
+              ? ' · ' + rectification?.disposalOrg
+              : ''),
+          sub: rectification?.disposalTime || '',
+          content: rectification?.processDescription,
+          imgs: [rectification?.processPic],
+        })
+      regulation &&
+        result.push({
+          title:
+            '联勤联动整治' +
+            (regulation?.disposalOrg ? ' · ' + regulation?.disposalOrg : ''),
+          sub: regulation?.disposalTime || '',
+          content: regulation?.processDescription,
+          imgs: [regulation?.processPic],
+        })
+      over &&
+        result.push({
+          title:
+            '已完结' + (over?.disposalOrg ? ' · ' + over?.disposalOrg : ''),
+          sub: over?.disposalTime || '',
+          content: over?.processDescription,
+          imgs: [over?.processPic],
+        })
+
       return result
     })
     return {

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

@@ -294,6 +294,7 @@ function onSelect(key: string, name: string) {
       url: api.GET_DISCOVER_LIST,
       params: {
         category: key,
+        bigscreenCommunityName: curView.value.name,
         pageSize: 9000,
       },
     })