接入智能发现统计数据

src/components/MonitorComponents/MonitorCard/mode4.vue

@@ -11,7 +11,8 @@
     {{title}}
   </div>
   <div class="card-content">
-    <img @click="handleClick" class="btn" v-if="btn" :src="require(`@/assets/images/${btn}.png`)"/>
+    <span @click="handleClick" class="btn span" v-if="btn && btn == '模型'" >{{btn}}</span>
+    <img @click="handleClick" class="btn" v-else-if="btn && btn != '模型'" :src="require(`@/assets/images/${btn}.png`)"/>
     <div class="edge top-right" />
     <div class="edge bottom-left" />
     <div class="edge bottom-right" />
@@ -58,7 +59,7 @@ export default {
     handleClick() {
       if (this.btn == 'map-icon') {
         this.$store.commit('SET_STREETMENU', true)
-      } else if (this.btn == 'list') {
+      } else if (this.btn == '模型') {
         this.$store.commit('SET_ELEMENTMODAL', true)
       }
     },
@@ -127,11 +128,18 @@ $color = rgba(113, 235, 255, 0.3)
     .btn
       z-index 100
       position absolute
-      top .5rem
+      top .3rem
       right @top
       width 1.3rem
       height @width
       cursor pointer
+      &.span
+        z-index 999
+        display block
+        width auto
+        top .2rem
+        right .4rem
+        text-align right
       &:hover
         box-shadow 0 0 1rem 0.1rem rgba(255,255,255,.5)
     .content

src/server/api.js

 let BASE_URL = ''
 switch (process.env.NODE_ENV) {
 case 'production':
-  BASE_URL = 'http://www.962121.net/hmfmstest/shanghaiwuye/propertyinspector/api/v1'
+  // BASE_URL = 'http://www.962121.net/hmfmstest/shanghaiwuye/propertyinspector/api/v1'
+  BASE_URL = 'http://211.136.105.193/apiv2/service-special'
   break
 default:
   // BASE_URL = 'http://yapi.omniview.pro/mock/54/propertyinspector/api/v1/'

src/store/actions.js

@@ -505,28 +505,38 @@ export default {
       },
       {
         title:'楼道充电',
-        img:'ld.png',
-        num:'0',
+        img:'cd.png',
+        num:'1',
       },
       {
-        title:'损坏房屋承重结构',
+        title:'损坏承重结构',
         img:'jg.png',
         num:'0',
       },
       {
-        title:'屋顶违建',
-        img:'dt.png',
-        num:'0',
+        title:'屋顶违章建筑',
+        img:'lj.png',
+        num:'1',
       },
       {
-        title:'非定时倾倒垃圾',
+        title:'密闭空间监控',
         img:'lj.png',
-        num:'0',
+        num:'1',
       },
       {
-        title:'维修资金使用异常',
-        img:'zj.png',
-        num:'0',
+        title:'窨井监控异常',
+        img:'ld.png',
+        num:'1',
+      },
+      {
+        title:'电梯运行异常',
+        img:'dt.png',
+        num:'1',
+      },
+      {
+        title:'水箱开启异常',
+        img:'sx.png',
+        num:'1',
       },
     ]
     commit('SET_COMMANDLIST', COMMANDLIST)
@@ -801,54 +811,75 @@ export default {
         img:'data1.png',
         num:'6',
         unit:'个',
+        key: 'today',
       },
       {
         title:'历史累计',
         img:'data2.png',
         num:'6',
         unit:'个',
+        key: 'total'
       },
     ]
     const FOUNDLIST = [     //智能发现列表下排
       {
-        title:'门卫保安离岗',
+        title:'门岗脱岗',
         img:'mw.png',
         num:'0',
+        key: 'staffLeaveAlarmTcfteodr'
       },
       {
         title:'占用消防通道',
         img:'xf.png',
         num:'1',
+        key: 'fireExits'
       },
       {
         title:'集中充电异常',
         img:'cd.png',
         num:'1',
+        key: 'ebcc'
       },
       {
-        title:'密闭空间监控',
-        img:'ld.png',
+        title:'楼道充电',
+        img:'cd.png',
         num:'1',
+        key: 'nonVehicleCharg'
       },
       {
-        title:'电梯运行异常',
-        img:'dt.png',
-        num:'1',
+        title:'损坏承重结构',
+        img:'jg.png',
+        num:'0',
+        key: 'buildingVibration'
       },
       {
-        title:'损坏称重结构',
-        img:'jg.png',
+        title:'屋顶违章建筑',
+        img:'lj.png',
         num:'0',
       },
       {
-        title:'窨井监控异常',
+        title:'密闭空间监控',
         img:'lj.png',
         num:'1',
+        key: 'hermeticSpace'
       },
       {
-        title:'水箱开启异常',
+        title:'窨井监控异常',
         img:'ld.png',
         num:'1',
+        key: 'manholeCover'
+      },
+      {
+        title:'电梯运行异常',
+        img:'dt.png',
+        num:'1',
+        key: 'elevatorLock'
+      },
+      {
+        title:'水箱开启异常',
+        img:'sx.png',
+        num:'1',
+        key: 'waterTank'
       },
     ]
     commit('SET_COMMANDLIST', COMMANDLIST)
@@ -1133,7 +1164,7 @@ export default {
     ]
     const FOUNDLIST = [     //智能发现列表下排
       {
-        title:'门卫保安离岗',
+        title:'门岗脱岗',
         img:'mw.png',
         num:'0',
       },
@@ -1148,29 +1179,39 @@ export default {
         num:'1',
       },
       {
-        title:'密闭空间监控',
-        img:'ld.png',
+        title:'楼道充电',
+        img:'cd.png',
         num:'1',
       },
       {
-        title:'电梯运行异常',
-        img:'dt.png',
+        title:'损坏承重结构',
+        img:'jg.png',
+        num:'0',
+      },
+      {
+        title:'屋顶违章建筑',
+        img:'lj.png',
         num:'1',
       },
       {
-        title:'损坏称重结构',
-        img:'jg.png',
-        num:'0',
+        title:'密闭空间监控',
+        img:'lj.png',
+        num:'1',
       },
       {
         title:'窨井监控异常',
-        img:'lj.png',
-        num:'0',
+        img:'ld.png',
+        num:'1',
+      },
+      {
+        title:'电梯运行异常',
+        img:'dt.png',
+        num:'1',
       },
       {
         title:'水箱开启异常',
-        img:'ld.png',
-        num:'0',
+        img:'sx.png',
+        num:'1',
       },
     ]
     commit('SET_COMMANDLIST', COMMANDLIST)

src/views/components/bottom-tabs.vue

@@ -32,7 +32,7 @@ export default {
 .bottom-tabs
   width 40%
   position fixed
-  bottom 21%
+  bottom 22%
   left 0
   right 0
   margin 0 auto

src/views/components/discovery.vue

@@ -66,7 +66,7 @@ export default {
           align-items center
           width 80%
           color #fff
-          font-size 1rem
+          font-size .9rem
           font-weight normal
           >img
             width 1.25rem

src/views/components/govern-analysis.vue

 <template>
   <div class="govern-analysis">
     <div @click="$emit('select', item.name)" class="item" v-for="item in datas" :key="item.name">
-      <img src="@/assets/images/icon1.png"/>
-      <p>{{item.name}}</p>
+      <img :src="require(`@/assets/images/${item.icon}.png`)"/>
+      <p :title="item.name">{{item.name}}</p>
     </div>
   </div>
 </template>
@@ -13,11 +13,11 @@ export default {
   data() {
     return {
       datas: [
-        {name: '物业服务满意度得分较低项目'},
-        {name: '物业服务企业整体满意度倒数企业'},
-        {name: '南码头街道业委会运作情况'},
-        {name: '南码头街道12345诉求数量全市排名'},
-        {name: '南码头街道综合管理诉求二级指标占比'},
+        {name: '住宅小区综合管理类诉求二级指标占比', icon: 'img1'},
+        {name: '物业服务满意度得分较低项目', icon: 'img2'},
+        {name: '物业服务企业整体满意度落后企业', icon: 'img2'},
+        {name: '12345诉求数量全市排名', icon: 'img3'},
+        {name: '业委会运作情况', icon: 'img4'},
       ],
 
     }
@@ -29,16 +29,21 @@ export default {
 .govern-analysis
   width 100%
   height 100%
-  display flex
-  flex-wrap wrap
   .item
     display flex
-    width 50%
     cursor pointer
+    align-items center
+    padding 0.25rem 0.5rem
+    &:nth-child(2n+1)
+      background rgba(0,0,0,0.5)
     &:hover
       color $color-blue
     img
-      width 1.2rem
+      width 1.4rem
       height @width
-      margin .3rem .5rem 0 0
+      margin 0 0.3rem 0.3rem 0
+    p
+      overflow hidden
+      white-space nowrap
+      text-overflow ellipsis
 </style>

src/views/components/manage-issue.vue

@@ -7,12 +7,12 @@
         :percent="circle.count"
         :size="90 * sizeRate"
         :trail-width="2 * sizeRate"
-        :stroke-width="6 * sizeRate"
+        :stroke-width="5 * sizeRate"
         trail-color="gray"
         :stroke-color="circle.color">
         <div>
           <b>{{circle.title}}</b>
-          <p style="font-size:.9rem;margin-top:.4rem;">已处置{{circle.count}}%</p>
+          <p style="font-size:.9rem;margin-top:.4rem;">{{circle.count}}分</p>
         </div>
       </i-circle>
     </div>
@@ -28,7 +28,7 @@
         v-for="item in datas"
         :key="item.name"
         >
-        <span class="title">
+        <span class="title" :title="item.name">
           {{item.name}}
         </span>
         <span :style="+item.count !== 0 ? 'color:red' : ''">{{item.count}}</span>
@@ -45,17 +45,17 @@ export default {
       circles: [
         {
           title: '安全',
-          count: 40,
+          count: 88.6,
           color: '#fee902',
         },
         {
           title: '有序',
-          count: 80,
+          count: 92.4,
           color: '#01a7ff',
         },
         {
           title: '干净',
-          count: 19,
+          count: 100,
           color: '#8fd618',
         },
       ],
@@ -123,7 +123,7 @@ $blue = #3391FF
     .item
       float left
       width 49%
-      height 3rem
+      height 2.4rem
       background-color rgba(6,27,50,0.9)
       margin 0.1rem
       padding 0 .7rem
@@ -137,4 +137,7 @@ $blue = #3391FF
           color #fff
           font-size 0.9rem
           font-weight normal
+          overflow hidden
+          white-space nowrap
+          text-overflow ellipsis
 </style>

src/views/components/map-menu.vue

@@ -20,7 +20,7 @@ export default {
       if (this.full) {
         return {
           left: '25%',
-          bottom: '21%',
+          bottom: '22%',
         }
       }
       return {

src/views/linyi.vue

@@ -4,13 +4,13 @@
       'title title title',
       'box1 . box5',
       'box2 . box5',
-      'box2 . box5',
+      'box8 . box5',
       'box8 . box3',
       'box8 . box10',
       'box6 box7 box9',
     ]"
     columns="1fr 2fr 1fr"
-    rows="3rem 1fr 1fr 1fr 1.5fr 1.5fr 1.9fr"
+    rows="3rem 1fr 2fr 1fr 1.5fr 1.5fr 2.3fr"
     gap="0.5rem"
     style="padding: 0.5rem"
     :complete="complete"
@@ -25,7 +25,7 @@
     <m-card v-show="complete" enter="fadeInLeft" leave="fadeOutLeft" area="box2" title="基础数据" mode="4">
       <BasicData />
     </m-card>
-    <m-card v-show="complete" enter="fadeInLeft" leave="fadeOutLeft" area="box8" title="管理要素" mode="4" btn="list">
+    <m-card v-show="complete" enter="fadeInLeft" leave="fadeOutLeft" area="box8" title="管理要素" mode="4" btn="模型">
       <ManageIssue showList/>
     </m-card>
     <m-card v-show="complete" area="box10" title="辅助应用" mode="4">
@@ -164,19 +164,15 @@ export default {
         {
           sensorType: {
             label: '传感器类型',
-            width: 12,
+            width: 9,
           },
           sensorNo: {
             label: '传感器编号',
-            width: 12,
-          },
-          type: {
-            label: '预警类型',
-            width: 12,
+            width: 9,
           },
           _status: {
             label: '状态',
-            width: 12,
+            width: 6,
           },
         }
       ],
@@ -194,10 +190,10 @@ export default {
         this.$refs.map.drawStreet(name, features[0].geometry.rings[0])
       })
       this.$refs.map.focus(3706.690186, -4234.159912, 8.5)
-      this.startTimer()
+      this.initLinyiData()
       setTimeout(() => {
         this.complete = true
-        this.initLinyiData()
+        this.startTimer()
         this.getCheckCommunityList({isPublish: 1, someday: '20200316'})
         this.getCheckCommunityList()
         this.getCheckedPeopleList()
@@ -266,7 +262,20 @@ export default {
       this.$ajax.get({
         url: this.$api.GET_DISCOVER_INFO,
       }).then(res => {
-        // console.log('res', res)
+        console.log('res', res)
+        const sum = {total: 0, today: 0}
+        const data = this.$com.confirm(res, 'data.content', [])
+        const originSum = JSON.parse(JSON.stringify(this.$store.state.discoveryList))
+        const originData = JSON.parse(JSON.stringify(this.$store.state.foundList))
+        data.forEach(e => {
+          sum.total += e.total
+          sum.today += e.numbers
+          const cur = originData.find(item => item.key == e.types)
+          if (cur) cur.num = e.numbers
+        })
+        originSum.forEach(e => e.num = sum[e.key])
+        this.$store.commit('SET_DISCOVERYLIST', originSum)
+        this.$store.commit('SET_FOUNDLIST', originData)
       })
     },
     handleStreetSelect(index, name) {
@@ -306,6 +315,8 @@ export default {
       overflow hidden
       width 14rem
       margin-right .5rem
+      &:first-child
+        color $fontColor
       &:nth-child(2)
         width 3rem
         text-align right

src/views/main.vue

@@ -4,13 +4,13 @@
       'title title title',
       'box1 . box5',
       'box2 . box5',
+      'box8 . box5',
       'box8 . box3',
-      'box8 . box4',
       'box8 . box10',
       'box6 box7 box9',
     ]"
     columns="1fr 2fr 1fr"
-    rows="3rem 1fr 1.5fr 1fr 1fr 1.3fr 1.8fr"
+    rows="3rem 0.8fr 1.2fr 0.5fr 1fr 1fr 1.5fr"
     gap="0.5rem"
     style="padding: 0.5rem"
     :complete="complete"
@@ -61,15 +61,15 @@
     <m-card v-show="complete" enter="fadeInLeft" leave="fadeOutLeft" area="box2" title="基础数据" mode="4">
       <Operation />
     </m-card>
-    <m-card v-show="complete" enter="fadeInLeft" leave="fadeOutLeft" area="box8" title="管理要素" mode="4" btn="list">
+    <m-card v-show="complete" enter="fadeInLeft" leave="fadeOutLeft" area="box8" title="管理要素" mode="4" btn="模型">
       <ManageIssue />
     </m-card>
     <m-card v-show="complete" area="box3" title="投诉报修" mode="4">
       <Repair />
     </m-card>
-    <m-card v-show="complete" area="box4" title="督查提醒" mode="4">
+    <!-- <m-card v-show="complete" area="box4" title="督查提醒" mode="4">
       <Supervision />
-    </m-card>
+    </m-card> -->
     <m-card v-show="complete" area="box9" title="视频监控" mode="4">
       <div style="display:flex;height:100%;padding:0.3rem;justify-content:space-between;">
         <ImgContainer style="width:48%;" text="小区入口岗亭" src="gate1.png"/>
@@ -113,8 +113,8 @@
           <div><p>提供便民服务或特约服务</p><p>79.81</p></div>
           <div><p>建筑垃圾有制定堆放点</p><p>80.34</p></div>
         </div>
-        <div v-else-if="analysisTitle == '物业服务企业整体满意度倒数企业'" class="content">
-          <div class="title">物业服务企业整体满意度倒数企业</div>
+        <div v-else-if="analysisTitle == '物业服务企业整体满意度落后企业'" class="content">
+          <div class="title">物业服务企业整体满意度落后企业</div>
           <div><p>上海豫园旅游商城物业管理有限公司</p><p>67.18</p></div>
           <div><p>上海华夏物业有限公司</p><p>69.74</p></div>
           <div><p>上海振南物业有限公司</p><p>75.29</p></div>
@@ -122,11 +122,11 @@
           <div><p>上海东方明珠物产管理有限公司</p><p>78.27</p></div>
           <div><p>上海富宁物业管理有限公司</p><p>79.51</p></div>
         </div>
-        <div v-else-if="analysisTitle == '南码头街道业委会运作情况'" class="chart-wrapper">
+        <div v-else-if="analysisTitle == '业委会运作情况'" class="chart-wrapper">
           <p class="title">南码头街道业委会运作情况</p>
           <m-chart :config="operationConfig" :data="operationData" />
         </div>
-        <div v-else-if="analysisTitle == '南码头街道12345诉求数量全市排名'" class="card">
+        <div v-else-if="analysisTitle == '12345诉求数量全市排名'" class="card">
           <p class="title">南码头街道12345诉求数量全市排名</p>
           <div class="inner">
             <div v-for="(item, i) in list" :key="i">
@@ -139,8 +139,8 @@
             </div>
           </div>
         </div>
-        <div v-else-if="analysisTitle == '南码头街道综合管理诉求二级指标占比'" class="chart-wrapper">
-          <p class="title">南码头街道综合管理诉求二级指标占比</p>
+        <div v-else-if="analysisTitle == '住宅小区综合管理类诉求二级指标占比'" class="chart-wrapper">
+          <p class="title">住宅小区综合管理类诉求二级指标占比</p>
           <m-chart :config="manageConfig" :data="manageData" />
         </div>
       </div>