修改勤务节点&添加垃圾暴露

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.273427b4.js"></script>
+<script type="module" crossorigin src="./assets/index.468a88b9.js"></script>
   <link rel="modulepreload" href="./assets/vendor.0a2bc783.js">
   <link rel="stylesheet" href="./assets/index.b71943ab.css">
 </head>

src/tools/index.ts

@@ -15,3 +15,43 @@ export function convertIds(number: string): string {
   if (!number) return ''
   return number.replace(/(\d{6})\d*(\d{2})/, '$1**********$2')
 }
+
+export function transType(type: string): { text: string; color: string } {
+  switch (type) {
+    case 'fire':
+      return {
+        text: '消防通道占用',
+        color: '#2F86EE',
+      }
+    case 'batteryCar':
+      return {
+        text: '电瓶车入梯',
+        color: '#ffd400',
+      }
+    case 'overflowingGarbage':
+      return {
+        text: '垃圾满溢',
+        color: '#00f2ff',
+      }
+    case 'groupRent':
+      return {
+        text: '违规租赁',
+        color: '#F7933E',
+      }
+    case 'highFall':
+      return {
+        text: '高抛隐患',
+        color: '#5BD5FF',
+      }
+    case 'ferrousGarbage':
+      return {
+        text: '垃圾暴露',
+        color: '#4F953B',
+      }
+    default:
+      return {
+        text: '无',
+        color: '#fff',
+      }
+  }
+}

src/view/components/dispose-list.vue

@@ -30,6 +30,7 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue'
 import empty from '@/assets/images/empty.png'
+import { transType } from '@/tools/index'
 
 export default defineComponent({
   name: 'DisposeList',
@@ -50,37 +51,7 @@ export default defineComponent({
     const handleClick = (data: unknown) => {
       ctx.emit('select', data)
     }
-    const transType = (type: string) => {
-      switch (type) {
-        case 'fire':
-          return {
-            text: '消防通道占用',
-            color: '#2F86EE',
-          }
-        case 'batteryCar':
-          return {
-            text: '电瓶车入梯',
-            color: '#ffd400',
-          }
-        case 'overflowingGarbage':
-          return {
-            text: '垃圾满溢',
-            color: '#00f2ff',
-          }
-        case 'groupRent':
-          return {
-            text: '违规租赁',
-            color: '#F7933E',
-          }
-        case 'highFall':
-          return {
-            text: '高抛隐患',
-            color: '#5BD5FF',
-          }
-        default:
-          return '无'
-      }
-    }
+
     return {
       empty,
       handleClick,

src/view/drawers/dispose-drawer.vue

@@ -66,6 +66,7 @@
 <script lang="ts">
 import { computed, defineComponent, PropType } from 'vue'
 import SubTitle from '../components/sub-title.vue'
+import { transType } from '@/tools/index'
 
 export default defineComponent({
   name: 'DisposeDrawer',
@@ -134,37 +135,6 @@ export default defineComponent({
       }
       return result
     })
-    const transType = (type: string) => {
-      switch (type) {
-        case 'fire':
-          return {
-            text: '消防通道占用',
-            color: '#2F86EE',
-          }
-        case 'batteryCar':
-          return {
-            text: '电瓶车入梯',
-            color: '#ffd400',
-          }
-        case 'overflowingGarbage':
-          return {
-            text: '垃圾满溢',
-            color: '#00f2ff',
-          }
-        case 'groupRent':
-          return {
-            text: '违规租赁',
-            color: '#F7933E',
-          }
-        case 'highFall':
-          return {
-            text: '高抛隐患',
-            color: '#5BD5FF',
-          }
-        default:
-          return '无'
-      }
-    }
     return {
       communityData,
       details,

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

@@ -31,7 +31,13 @@
     <div class="wrapper">
       <m-sub2>快处闭环</m-sub2>
       <div class="events">
-        <m-scroll :length="events.length" :limit="5" mode="2" :step="0.8">
+        <m-scroll
+          v-if="events.length > 0"
+          :length="events.length"
+          :limit="5"
+          mode="2"
+          :step="0.8"
+        >
           <div
             v-for="(item, i) in events"
             :key="i"
@@ -91,6 +97,7 @@
             </div>
           </div>
         </m-scroll>
+        <m-empty v-else />
       </div>
     </div>
   </m-card>
@@ -155,7 +162,7 @@ const sub = ref([
 ])
 const list = ref([
   { name: '电瓶车入梯', value: 0, key: '1' },
-  { name: '垃圾暴露', value: 0, key: '// Todo' },
+  { name: '垃圾暴露', value: 0, key: '5' },
   { name: '占用消防通道', value: 0, key: '0' },
   { name: '垃圾满溢', value: 0, key: '2' },
   { name: '高抛隐患', value: 0, key: '4' },
@@ -221,10 +228,11 @@ onMounted(() => {
         overflowingGarbage = 0, //垃圾满溢
         groupRent = 0, //群租
         highFall = 0, //高抛
+        ferrousGarbage = 0, // 垃圾暴露
       } = res?.data?.content || {}
       list.value = [
         { name: '电瓶车入梯', value: batteryCar, key: '1' },
-        { name: '垃圾暴露', value: 0, key: '// Todo' },
+        { name: '垃圾暴露', value: ferrousGarbage, key: '5' },
         { name: '占用消防通道', value: fire, key: '0' },
         {
           name: '垃圾满溢',
@@ -236,16 +244,7 @@ onMounted(() => {
       ]
     })
 })
-const events = ref<any>([
-  {
-    name: '占用消防通道',
-    time: '2020-03-13 13:23:08',
-    department: '小区物业',
-    discover: c1,
-    process: c2,
-    cur: 2,
-  },
-])
+const events = ref<any[]>([])
 ajax
   .get({
     url: api.GET_DISCOVER_LIST,
@@ -270,6 +269,8 @@ const transName = (type: string) => {
       return '违规租赁'
     case 'highFall':
       return '高抛隐患'
+    case 'ferrousGarbage':
+      return '垃圾暴露'
     default:
       return '无'
   }

src/view/right/duty.vue

@@ -4,7 +4,7 @@
     <m-sub2>综合管理</m-sub2>
     <div class="details">
       <m-scroll
-        v-if="caseList.length > 0"
+        v-if="show && caseList.length > 0"
         :limit="3"
         :length="caseList.length"
         :step="0.88"
@@ -24,7 +24,7 @@
             <p>{{ item.address }}</p>
             <p>{{ item.acceptTime }}</p>
           </div>
-          <m-step :steps="steps" :current="steps.indexOf(item.phase)" />
+          <m-step :steps="steps" :current="steps.indexOf(item.status)" />
         </div>
       </m-scroll>
       <m-empty v-else />
@@ -41,6 +41,14 @@ export default defineComponent({
   name: 'Duty',
   components: { Brief },
   setup() {
+    const curViewType = computed(() => store.state.curView.type)
+    const show = computed(() => {
+      return (
+        curViewType.value === 'work1' ||
+        curViewType.value === 'work2' ||
+        curViewType.value === 'work3'
+      )
+    })
     const summary = computed(() => {
       const {
         comprehensiveNum = 0,
@@ -65,7 +73,7 @@ export default defineComponent({
         },
       ]
     })
-    const steps = ref(['发现', '立案', '派遣', '处置', '核查', '结案'])
+    const steps = ref(['已发现', '已受理', '已派单', '已签收', '已结案'])
     const caseList = computed(() => store.state.dutyList)
     watch(
       () => store.state.curView.id,
@@ -82,6 +90,7 @@ export default defineComponent({
       summary,
       caseList,
       steps,
+      show,
     }
   },
 })