调整

index.html

@@ -15,8 +15,8 @@
     <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>
-  <script src="./static//hls.js"></script>
-  <script src="./static/SMap.min.js"></script>
-  <!-- <script src="./static/esm/SMap.min.js"></script> -->
+  <script src="./static/hls.js"></script>
+  <!-- <script src="./static/SMap.min.js"></script> -->
+  <script src="./static/esm/SMap.min.js"></script>
   <script src="./static/Plugins.min.js"></script>
 </html>

src/server/api.js

@@ -30,5 +30,5 @@ export default {
   GET_COMPRESS_COUNT: '/dc/countCompressStationsByStreet', // 街道小型压缩站数目
   GET_GARBAGE_COUNT: '/dc/countPointsByStreet', // 街道垃圾收集点数目
   GET_TOILET_COUNT: '/dc/countToiletsByStreet', // 街道环卫公厕数目
-  GET_VIDEO_URL: 'http://10.89.1.208:7000/hawkeye/api/v1/camera/',
+  GET_VIDEO_URL: 'http://10.89.1.208:7000/hawkeye/api/v1/camera/', // 后面接id获取视频地址
 }

src/store/actions.js

@@ -61,9 +61,8 @@ export default {
     })
   },
   async getGridSum({commit}) {
-    const today = moment().format('YYYY-MM-DD')
-    const start = `${today} 00:00:00`
-    const end = `${today} 24:00:00`
+    const start = moment().add(-10, 'days').format('YYYY-MM-DD')
+    const end = moment().format('YYYY-MM-DD')
     const total = await ajax.get({url: api.DATA_URL + api.GET_GRID_TOTAL, params: {street: curStreet, start, end}})
     const solving = await ajax.get({url: api.DATA_URL + api.GET_GRID_SOLVING, params: {street: curStreet, start, end}})
     const overdue = await ajax.get({url: api.DATA_URL + api.GET_GRID_OVERDUE, params: {street: curStreet, start, end}})
@@ -74,11 +73,10 @@ export default {
     commit('SET_NOT_ALERT_SUM', [+overdue2 || 0, +solving2 || 0, +total2 || 0])
   },
   async getPopulationInfo({commit}) {
-    const year1 = await ajax.get({url: api.DATA_URL + api.GET_POPULATION_INFO, params: {year: moment().add(-3, 'y').format('YYYY')}})
-    const year2 = await ajax.get({url: api.DATA_URL + api.GET_POPULATION_INFO, params: {year: moment().add(-2, 'y').format('YYYY')}})
-    const year3 = await ajax.get({url: api.DATA_URL + api.GET_POPULATION_INFO, params: {year: moment().add(-1, 'y').format('YYYY')}})
-    if (year1 && year2 && year3) {
-      const result = [year1, year2, year3].map(year => year.find(item => item.street == '总计'))
+    const year1 = await ajax.get({url: api.DATA_URL + api.GET_POPULATION_INFO, params: {year: moment().add(-2, 'y').format('YYYY')}})
+    const year2 = await ajax.get({url: api.DATA_URL + api.GET_POPULATION_INFO, params: {year: moment().add(-1, 'y').format('YYYY')}})
+    if (year1 && year2) {
+      const result = [year1, year2].map(year => year.find(item => item.street == '总计'))
       commit('SET_LAND_POPULATION_INFO', result)
     }
   },

src/store/state.js

@@ -5,7 +5,7 @@ export default {
   showCommandModal: false,
   showPatrolModal: false,
   patrolData: {},
-  landPopulationInfo: [{}, {}, {}],
+  landPopulationInfo: [],
   greenInfo: [],
   discoverTrend: [],
   repairRate: [],
@@ -59,10 +59,10 @@ export default {
     },
   ],
   videoInfo: [
-    {id: 31011022001328101004,	address: '殷高东路国安路',	location: '星汇广场一期8号楼楼顶',	street: '新江湾',	committee: '国安路居委会',	community: '星汇广场一期'},
-    {id: 31011022001328102007,	address: '殷高东路政芳路',	location: '中凯城市之光37号楼顶',	street: '新江湾',	committee: '国安路居委会',	community: '中凯城市之光'},
-    {id: 31011022001328103005,	address: '民府路国霞路',	location: '三湘未来海岸楼顶',	street: '新江湾',	committee: '国安路居委会',	community: '三湘未来海岸'},
-    {id: 31011022001328104005,	address: '殷行路淞沪路',	location: '东方枫憬楼顶',	street: '新江湾',	committee: '睿达路居委会',	community: '戎辉苑'},
+    {id: '31011022001328101004',	address: '殷高东路国安路',	location: '星汇广场一期8号楼楼顶',	street: '新江湾',	committee: '国安路居委会',	community: '星汇广场一期'},
+    {id: '31011022001328102007',	address: '殷高东路政芳路',	location: '中凯城市之光37号楼顶',	street: '新江湾',	committee: '国安路居委会',	community: '中凯城市之光'},
+    {id: '31011022001328103005',	address: '民府路国霞路',	location: '三湘未来海岸楼顶',	street: '新江湾',	committee: '国安路居委会',	community: '三湘未来海岸'},
+    {id: '31011022001328104005',	address: '殷行路淞沪路',	location: '东方枫憬楼顶',	street: '新江湾',	committee: '睿达路居委会',	community: '戎辉苑'},
   ],
   xinjiangwanPaths: [
     [

src/views/components/combine.vue

@@ -73,8 +73,10 @@ export default {
     margin-bottom .1rem
     position relative
     cursor pointer
+    transition background .2s, box-shadow .3s ease-in-out
     &:hover
       background $section-hover
+      box-shadow -0.05rem .01rem .05rem .01rem rgba(0,0,0,0.8)
     h5
       font-size .1rem
     >div

src/views/components/grid-management.vue

@@ -49,10 +49,12 @@ export default {
     img
       width .25rem
       height @width
-      margin-right .1rem
+      margin .05rem .1rem 0 0
     p
       color $fontColor
     span
+      display inline-block
+      min-width .3rem
       flex 1
       color #aaa
       font-size .08rem

src/views/components/house.vue

@@ -80,7 +80,7 @@ export default {
             {text: '有序', index: 2, max: 25},
           ],
           center: ['50%', '60%'],
-          radius: '45%',
+          radius: '60%',
         }],
         series: [{
           type: 'radar',
@@ -178,6 +178,9 @@ export default {
         color $edgeColor
         padding .02rem .03rem
         border-radius .02rem
+        cursor pointer
+        &:hover
+          $selected()
     .example
       flex 1
       $flex-center()

src/views/components/land-population.vue

@@ -7,7 +7,8 @@
       <p>{{item.label}}</p>
       <div>
         <div v-for="(child, i) in item.data" :key="i">
-          <m-count class="count" :value="child.value" :decimal="child.dec || 0"/>
+          <span v-if="child.value === null" class="count"> - </span>
+          <m-count v-else class="count" :value="child.value" :decimal="child.dec || 0"/>
           <span class="unit">{{child.unit}}</span>
           <img v-if="child.up" src="@/assets/images/up.png"/>
         </div>
@@ -26,29 +27,27 @@ export default {
   },
   computed: {
     list() {
-      const {year1 = {}, year2 = {}, year3 = {}} = this.$store.state.landPopulationInfo
-      const {density1 = 0} = year1
+      const [year1 = {}, year2 = {}] = this.$store.state.landPopulationInfo
+      const {year: label1 = '', area: area1 = 0, registered_population: population1 = 0, population_density: density1 = 0} = year1
       const {year: label2 = '', area: area2 = 0, registered_population: population2 = 0, population_density: density2 = 0} = year2
-      const {year: label3 = '', area: area3 = 0, registered_population: population3 = 0, population_density: density3 = 0} = year3
-      const rate2 = (+density2 - +density1) / +density1
-      const rate3 = (+density3 - +density2) / +density2
+      const rate = (+density2 - +density1) / +density1
       return [
         {
-          label: label2 + '年末',
+          label: label1 + '年末',
           data: [
-            {value: +area2 || 0, unit: 'k㎡', dec: 2},
-            {value: +population2 || 0, unit: '人'},
-            {value: +density2 || 0, unit: '人/k㎡'},
-            {value: rate2, unit: '%', dec: 2},
+            {value: +area1 || 0, unit: 'k㎡', dec: 2},
+            {value: +population1 || 0, unit: '人'},
+            {value: +density1 || 0, unit: '人/k㎡'},
+            {value: null, unit: '', },
           ]
         },
         {
-          label: label3 + '年末',
+          label: label2 + '年末',
           data: [
-            {value: +area3 || 0, unit: 'k㎡', dec: 2, up: area3 > area2},
-            {value: +population3 || 0, unit: '人', up: population3 > population2},
-            {value: +density3 || 0, unit: '人/k㎡', up: density3 > density2},
-            {value: rate3, unit: '%', dec: 2, up: rate3 > rate2},
+            {value: +area2 || 0, unit: 'k㎡', dec: 2, up: area2 > area1},
+            {value: +population2 || 0, unit: '人', up: population2 > population1},
+            {value: +density2 || 0, unit: '人/k㎡', up: density2 > density1},
+            {value: rate, unit: '%', dec: 2},
           ]
         },
       ]
@@ -72,6 +71,7 @@ export default {
     justify-content center
     >p
       line-height .2rem
+      margin-bottom .01rem
   .content
     width 38%
     height 100%

src/views/components/patrol.vue

@@ -89,8 +89,10 @@ export default {
       background $section-bg
       height .65rem
       cursor pointer
+      transition background .2s, box-shadow .3s ease-in-out
       &:hover
         background $section-hover
+        box-shadow -0.05rem .01rem .05rem .01rem rgba(0,0,0,0.8)
       &.over
         border-color #ff6160
       h5

src/views/components/right-component.vue

@@ -48,6 +48,7 @@ export default {
       }).then(res => {
         this.$emit('video', this.$com.confirm(res, 'payload.url'))
       })
+      // this.$emit('video', 'http://10.216.71.20:83/openUrl/TMIXpTy/live.m3u8')
     }
   },
 }

src/views/main.vue

@@ -70,9 +70,10 @@ export default {
             label: '小区名称',
             width: 12,
           },
-          communityAddr: {
-            label: '小区地址',
+          check_type: {
+            label: '发现方式',
             width: 12,
+            format: val => val || '智能发现'
           },
         },
         {
@@ -87,14 +88,9 @@ export default {
           },
         },
         {
-          check_type: {
-            label: '发现方式',
-            width: 12,
-            format: val => val || '智能发现'
-          },
           device_name: {
             label: '设备地点',
-            width: 12,
+            width: 24,
           },
         },
       ],