调整

src/components/MonitorComponents/MonitorMap/monitor-map.vue

@@ -127,7 +127,7 @@ export default {
     // 添加边界
     addBoundary({name, weight = 10, count = 10, color = 'rgba(51,145,255,.6)', maskColor = [0, 0, 0, 0]}) {
       const boundary = {
-        boundaryType: 'jd_boundary',
+        boundaryType: 'qx_boundary',
         boundaryDefinition: `name like '%${name}%'`,
         boundarydistance: weight,
         bounarycount: count,

src/components/MonitorComponents/MonitorModal/monitor-modal.vue

@@ -10,7 +10,7 @@
         </p>
         <div>
           <img class="flag" src="@/assets/images/modal-title1.png"/>
-          <img @click="handleClose" class="close-btn" src="@/assets/images/close.png"/>
+          <img @click="handleClose" class="close-btn" src="@/assets/images/close-modal.png"/>
         </div>
         <img class="left" src="@/assets/images/modal-title-left.png"/>
       </div>

src/components/MonitorComponents/MonitorTitle/monitor-title.vue

@@ -5,8 +5,10 @@
         <span>{{curDate}}</span>
       </DatePicker>
     </span> -->
+    <div class="btn back" @click="closePage" />
+    <div class="btn close" @click="closePage" />
     <span v-if="!hideTime" class="moment time">
-      <span class="switch"><img src="@/assets/images/switch.png"/> 切换街道</span>
+      <!-- <span class="switch"><img src="@/assets/images/switch.png"/> 切换街道</span> -->
       {{curDate}} {{time}}
     </span>
     <img :src="bgImg" draggable="false"/>
@@ -86,6 +88,12 @@ export default {
       this.$store.commit('SET_CURDATE', date)
       this.openDatePicker = false
     },
+    // toAli() {
+    //   window.location = 'http://10.89.1.208/share/ypdp'
+    // },
+    closePage() {
+      window.close()
+    },
   }
 }
 </script>
@@ -100,6 +108,25 @@ export default {
   background-position center
   // font-family $font-pang
   font-weight bold
+  >.btn
+    position absolute
+    width .2rem
+    height @width
+    top .05rem
+    cursor pointer
+    z-index 999
+    background-size 100% 100%
+    transition background-image .3s ease-in-out
+    &.back
+      left .1rem
+      background-image url(../../../assets/images/back.png)
+      &:hover
+        background-image url(../../../assets/images/back-on.png)
+    &.close
+      right .1rem
+      background-image url(../../../assets/images/close.png)
+      &:hover
+        background-image url(../../../assets/images/close-on.png)
   .switch
     color #5BD5FF
     margin-right .1rem
@@ -122,7 +149,7 @@ export default {
       right 0
       margin 0 auto
       text-align center
-      transform translateX(25%)
+      transform translateX(20%)
   >img
     position absolute
     width 100%

src/views/components/industry-supervise.vue

@@ -131,7 +131,7 @@ export default {
     display flex
     >div
       &:first-child
-        width 60%
+        width 63%
         position relative
         >img
           width 36%

src/views/components/operation-sign.vue

@@ -77,28 +77,15 @@ export default {
       curTab: 'all',
       config: {
         colors: ['#E44949', '#FDA62D', '#FFCE34', '#71C012', '#6BE1B2', '#DC732D', '#5BD5FF', '#006ED4', '#2E43C9', '#826AFA', '#CCCCCC'],
-        // tooltip: {
-        //   formatter: '{b}：{c}个 ({d}%)',
-        //   confine: true,
-        // },
+        tooltip: {
+          formatter: '{b}：{c}%',
+          confine: true,
+        },
         legend: {hide: true},
         shape: [
           {type: 'pie', radius: [40 * Number((screen.height / 800).toFixed(1)), 55 * Number((screen.height / 800).toFixed(1))], center: ['40%', '50%']}
         ]
       },
-      // chartData: [
-      //   {name: '上海延吉物业', value: 6},
-      //   {name: '上海四平物业', value: 3},
-      //   {name: '上海殷行物业', value: 3},
-      //   {name: '上海阳置物业', value: 3},
-      //   {name: '上海凯晨物业', value: 2},
-      //   {name: '上海兴桥盛物业', value: 2},
-      //   {name: '上海五角场物业', value: 2},
-      //   {name: '上海文化银湾物业', value: 2},
-      //   {name: '上海海鸿福船物业', value: 2},
-      //   {name: '上海平凉物业', value: 1},
-      //   {name: '其他', value: 74},
-      // ],
     }
   },
   computed: {
@@ -146,6 +133,7 @@ export default {
   .operation-sign
     .ivu-select-dropdown
     .ivu-select-selection
+      font-size .1rem !important
       border-color #3391FF !important
       border-radius .04rem !important
       >div
@@ -202,15 +190,18 @@ export default {
         justify-content space-between
         background linear-gradient(to right, rgba(20,92,143,.5), transparent)
         border-left .03rem solid #315E8B
-        padding .1rem .04rem
+        padding .06rem .04rem
+        p
+          &:first-child
+            width 40%
   .bar
-    width 100%
+    width 98%
     height .08rem
     display flex
-    margin-top .3rem
+    margin .3rem auto 0
     >div
       >p
-        text-indent .05rem
+        text-indent .03rem
         font-size .12rem
         font-weight bold
         transform translateY(-100%)

src/views/main.vue

@@ -87,7 +87,7 @@ export default {
   },
   computed: {
     ...mapState([
-      'xinjiangwanPaths',
+      'yangpuPaths',
       'commandLayout',
       'commandData',
       'showCommandModal',
@@ -114,11 +114,11 @@ export default {
     init() {
       const {map} = this.$refs
       this.initMapFocus()
-      map.addPolygon({paths: this.xinjiangwanPaths, fillColor: 'rgba(51,145,255,.3)'})
-      map.addBoundary({name: '新江湾城'})
+      map.addPolygon({paths: this.yangpuPaths, fillColor: 'rgba(51,145,255,.3)'})
+      map.addBoundary({name: '杨浦区'})
     },
     initMapFocus() {
-      this.$refs.map.focus(3489.0714111328125, 10384.431030273437, 4.5)
+      this.$refs.map.focus(3489.0714111328125, 10384.431030273437, 3.5)
     },
     handleMapClick(data) {
       this.detailData = data