修改图标

b623e3cc · 郭铭瑶 · 9640a665 · b623e3cc · 9640a665 · b623e3cc
Commit b623e3cc authored Sep 03, 2020 by 郭铭瑶 🤘
44 changed files
--- a/dist/index.html
+++ b/dist/index.html
 <!DOCTYPE html><html id=html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta http-equiv=X-UA-Compatible content="IE=edge, chrome=1"><title>浦东新区智慧物业管理微平台</title><style>html {
        font-size: 1.6vh;
-      }</style><script src=./static/jquery.min.js></script><script language=javascript src="http://webapi.amap.com/maps?v=1.4.15&key=ee2b5d5c0c44c768f1d2593eb4a7dfa6&plugin=Map3D,AMap.DistrictSearch,AMap.ControlBar,ElasticMarker"></script><link href=./static/css/app.7007b0431fd3e2500e3fe979fd52b1be.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.301ee5b572d02712e571.js></script><script type=text/javascript src=./static/js/vendor.d11eae825e5c4a0e0bb2.js></script><script type=text/javascript src=./static/js/app.608ba7089ec25260f765.js></script></body></html>
+      }</style><script src=./static/jquery.min.js></script><script language=javascript src="http://webapi.amap.com/maps?v=1.4.15&key=ee2b5d5c0c44c768f1d2593eb4a7dfa6&plugin=Map3D,AMap.DistrictSearch,AMap.ControlBar,ElasticMarker"></script><link href=./static/css/app.f581fe0f46c2378cb98f64cd9ad651d4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.73a5f532af71066b89a7.js></script><script type=text/javascript src=./static/js/vendor.d11eae825e5c4a0e0bb2.js></script><script type=text/javascript src=./static/js/app.28569ee3b457ee5d4d64.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.7007b0431fd3e2500e3fe979fd52b1be.css.map
+++ b/dist/static/css/app.7007b0431fd3e2500e3fe979fd52b1be.css.map
--- a/dist/static/css/app.7007b0431fd3e2500e3fe979fd52b1be.css
+++ b/dist/static/css/app.7007b0431fd3e2500e3fe979fd52b1be.css
--- a/dist/static/css/app.f581fe0f46c2378cb98f64cd9ad651d4.css.map
+++ b/dist/static/css/app.f581fe0f46c2378cb98f64cd9ad651d4.css.map
--- a/dist/static/img/2d3d.c57b7f7.png
+++ b/dist/static/img/2d3d.c57b7f7.png
--- a/dist/static/img/full.94c1f8f.png
+++ b/dist/static/img/full.94c1f8f.png
--- a/dist/static/img/full.9df2a87.png
+++ b/dist/static/img/full.9df2a87.png
--- a/dist/static/img/switch.19c8519.png
+++ b/dist/static/img/switch.19c8519.png
--- a/dist/static/img/warn.ab2e544.png
+++ b/dist/static/img/warn.ab2e544.png
--- a/dist/static/img/zoomin.2fd7e8f.png
+++ b/dist/static/img/zoomin.2fd7e8f.png
--- a/dist/static/img/zoomin.caaffb2.png
+++ b/dist/static/img/zoomin.caaffb2.png
--- a/dist/static/img/zoomout.00ba599.png
+++ b/dist/static/img/zoomout.00ba599.png
--- a/dist/static/img/zoomout.ed657e4.png
+++ b/dist/static/img/zoomout.ed657e4.png
--- a/dist/static/js/0.c199e6889a5b18cf9c09.js
+++ b/dist/static/js/0.c199e6889a5b18cf9c09.js
--- a/dist/static/js/0.c199e6889a5b18cf9c09.js.map
+++ b/dist/static/js/0.c199e6889a5b18cf9c09.js.map
--- a/dist/static/js/0.f95e627fa2b7205457c8.js
+++ b/dist/static/js/0.f95e627fa2b7205457c8.js
--- a/dist/static/js/0.f95e627fa2b7205457c8.js.map
+++ b/dist/static/js/0.f95e627fa2b7205457c8.js.map
--- a/dist/static/js/2.217974ef7143d4b3d5ec.js
+++ b/dist/static/js/2.217974ef7143d4b3d5ec.js
--- a/dist/static/js/2.217974ef7143d4b3d5ec.js.map
+++ b/dist/static/js/2.217974ef7143d4b3d5ec.js.map
--- a/dist/static/js/2.817426aae3d570ed42ad.js
+++ b/dist/static/js/2.817426aae3d570ed42ad.js
--- a/dist/static/js/2.817426aae3d570ed42ad.js.map
+++ b/dist/static/js/2.817426aae3d570ed42ad.js.map
--- a/dist/static/js/23.d11a200d85d7b566a845.js
+++ b/dist/static/js/23.d11a200d85d7b566a845.js
--- a/dist/static/js/23.9d67aeb891284656ae08.js.map
+++ b/dist/static/js/23.9d67aeb891284656ae08.js.map
--- a/dist/static/js/23.d11a200d85d7b566a845.js.map
+++ b/dist/static/js/23.d11a200d85d7b566a845.js.map
--- a/dist/static/js/4.1f7557b444fdafeae962.js
+++ b/dist/static/js/4.1f7557b444fdafeae962.js
--- a/dist/static/js/4.1f7557b444fdafeae962.js.map
+++ b/dist/static/js/4.1f7557b444fdafeae962.js.map
--- a/dist/static/js/app.608ba7089ec25260f765.js
+++ b/dist/static/js/app.608ba7089ec25260f765.js
--- a/dist/static/js/app.608ba7089ec25260f765.js.map
+++ b/dist/static/js/app.608ba7089ec25260f765.js.map
--- a/dist/static/js/manifest.301ee5b572d02712e571.js
+++ b/dist/static/js/manifest.301ee5b572d02712e571.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,f){for(var o,b,d,i=0,u=[];i<r.length;i++)b=r[i],t[b]&&u.push(t[b][0]),t[b]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);for(n&&n(r,c,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=a(a.s=f[i]);return d};var r={},t={27:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,a.nc&&f.setAttribute("nonce",a.nc),f.src=a.p+"static/js/"+e+"."+{0:"c199e6889a5b18cf9c09",1:"80f3e7aa96153395fe1b",2:"217974ef7143d4b3d5ec",3:"858079b6f37c68e0f6a5",4:"1f7557b444fdafeae962",5:"79501cbfbec9e7ca1a2b",6:"151dc3ea26d64d8986cf",7:"eaaa3330e850030e6f86",8:"5ad0f24b31031f7284b3",9:"fd7707babb1b38a1555a",10:"3bc8ba3be9d993618346",11:"e0d0852893a051f35f47",12:"b26fc350b53d2b30f1b4",13:"16cbe0e33860ff72d492",14:"92a81e60880a6ae73756",15:"f0fdcca849fc839cdb19",16:"71b39e7f56791784419e",17:"267ef980ea0c07fe9923",18:"f2a6183255aeb9176721",19:"1966c1eecf8c80e445be",20:"d18b679d14bc0ba80f28",23:"d11a200d85d7b566a845",24:"f7914065b4d7bec4ccfb",25:"6b5f4749058978064562",26:"584ddfc7aad303eb351f"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=b,c.appendChild(f),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.301ee5b572d02712e571.js.map
\ No newline at end of file
--- a/dist/static/js/manifest.73a5f532af71066b89a7.js
+++ b/dist/static/js/manifest.73a5f532af71066b89a7.js
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,b,d,i=0,u=[];i<r.length;i++)b=r[i],a[b]&&u.push(a[b][0]),a[b]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)d=t(t.s=o[i]);return d};var r={},a={27:0};function t(n){if(r[n])return r[n].exports;var a=r[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=a[e]=[r,t]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"static/js/"+e+"."+{0:"f95e627fa2b7205457c8",1:"80f3e7aa96153395fe1b",2:"817426aae3d570ed42ad",3:"858079b6f37c68e0f6a5",4:"a0223cdec419a43c72b2",5:"79501cbfbec9e7ca1a2b",6:"151dc3ea26d64d8986cf",7:"eaaa3330e850030e6f86",8:"5ad0f24b31031f7284b3",9:"fd7707babb1b38a1555a",10:"3bc8ba3be9d993618346",11:"e0d0852893a051f35f47",12:"b26fc350b53d2b30f1b4",13:"16cbe0e33860ff72d492",14:"92a81e60880a6ae73756",15:"f0fdcca849fc839cdb19",16:"71b39e7f56791784419e",17:"267ef980ea0c07fe9923",18:"f2a6183255aeb9176721",19:"1966c1eecf8c80e445be",20:"d18b679d14bc0ba80f28",23:"9d67aeb891284656ae08",24:"f7914065b4d7bec4ccfb",25:"6b5f4749058978064562",26:"584ddfc7aad303eb351f"}[e]+".js";var f=setTimeout(b,12e4);function b(){o.onerror=o.onload=null,clearTimeout(f);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return o.onerror=o.onload=b,c.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.73a5f532af71066b89a7.js.map
\ No newline at end of file
--- a/dist/static/js/manifest.301ee5b572d02712e571.js.map
+++ b/dist/static/js/manifest.301ee5b572d02712e571.js.map
--- a/src/assets/images/2d3d.png
+++ b/src/assets/images/2d3d.png
--- a/src/assets/images/full.png
+++ b/src/assets/images/full.png
--- a/src/assets/images/no-warn.png
+++ b/src/assets/images/no-warn.png
--- a/src/assets/images/switch.png
+++ b/src/assets/images/switch.png
--- a/src/assets/images/warn.png
+++ b/src/assets/images/warn.png
--- a/src/assets/images/zoomin.png
+++ b/src/assets/images/zoomin.png
--- a/src/assets/images/zoomout.png
+++ b/src/assets/images/zoomout.png
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -365,7 +365,7 @@ export default {
      sensorList.forEach(sensor => {
        sensor._scene = common.getSensorScene(sensor.type)
        sensor._status = sensor.state == '1' ? '报警' : '正常'
-        sensor.state == '1' ? sensor.icon = 'warn.png' : null
+        sensor.state == '1' ? sensor.icon = 'icon7.png' : null
      })
      commit('SET_SENSORLIST', sensorList)
    })

--- a/src/views/components/map-menu.vue
+++ b/src/views/components/map-menu.vue
 <template>
  <div class="map-menu" :style="style">
-    <span @click="$emit('3d')">2D/3D</span>
+    <img @click="$emit('3d')" src="@/assets/images/2d3d.png"/>
    <img @click="$emit('switch')" src="@/assets/images/switch.png"/>
    <img @click="$emit('in')" src="@/assets/images/zoomin.png"/>
    <img @click="$emit('out')" src="@/assets/images/zoomout.png"/>
@@ -21,8 +21,8 @@ export default {
    style() {
      if (this.full) {
        return {
-          left: '25%',
+          left: '25.5%',
-          bottom: '22%',
+          bottom: '23%',
        }
      }
      return {
@@ -41,18 +41,13 @@ export default {
  flex-direction column
  z-index 1000
  transition all .5s
-  span,
  img
    color #4eb5db
-    width 2.4rem
+    width 1.8rem
    height @width
    margin-bottom 0.3rem
    cursor pointer
    transition transform .3s
-    &:nth-of-type(1)
-      width 1.4rem
-      height @width
-      margin 0 0 .8rem .5rem
    &:hover
      transform scale(1.5)
 </style>
--- a/src/views/components/street-menu.vue
+++ b/src/views/components/street-menu.vue
@@ -58,6 +58,7 @@ export default {
 <style lang="stylus" scoped>
 .street-menu
  // font-family $font-din
+  z-index 999
  position fixed
  width 26rem
  padding 1rem

--- a/src/views/linyi copy.vue
+++ b/src/views/linyi copy.vue
@@ -764,7 +764,7 @@ export default {
    '$store.state.sensorList': {
      handler(cur) {
        this.clearPoints()
-        this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'no-warn.png'})
+        this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'icon6.png'})
      }
    },
  }

--- a/src/views/linyi.vue
+++ b/src/views/linyi.vue
@@ -2,8 +2,8 @@
 <div style="width:100%;height:100vh;">
  <div class="border left"/>
  <div class="border right"/>
-  <m-animate enter="flipInY" leave="flipOutY">
+  <m-animate enter="zoomInRight" leave="zoomOutRight">
-    <div v-show="!test" id="linyiMap"/>
+    <div v-show="!hide3d" id="linyiMap"/>
  </m-animate>
  <m-grid
    :template="[
@@ -21,8 +21,8 @@
    style="padding: 0.5rem;"
    :complete="complete"
  >
-    <m-animate enter="flipInY" leave="flipOutY">
+    <m-animate enter="zoomInLeft" leave="zoomOutLeft">
-      <m-map v-show="test" ref="map" @event="handleMapClick" @complete="mapComplete" />
+      <m-map v-show="hide3d" ref="map" @event="handleMapClick" @complete="mapComplete" />
    </m-animate>
    <m-animate enter="fadeInDown" leave="fadeOutUp">
      <m-title area="title" color="#fff" :bgImg="require('@/assets/images/title-bg4.png')">浦东新区物业微平台(临沂二村居委)</m-title>
@@ -88,7 +88,7 @@
        @repair-select="(data) => {this.repairDetail = data; this.showRepairDetail = true;}"
      />
    </m-card>
-    <MapMenu :full="complete" @3d="test = !test" @switch="handleSwitchIcon" @full="complete = !complete" @in="$refs.map.zoomIn()" @out="$refs.map.zoomOut()"/>
+    <MapMenu :full="complete" @3d="hide3d = !hide3d" @switch="handleSwitchIcon" @full="complete = !complete" @in="$refs.map.zoomIn()" @out="$refs.map.zoomOut()"/>
    <StreetMenu @select="handleStreetSelect"/>
    <m-modal :value="$store.state.showElementModal" @close="$store.commit('SET_ELEMENTMODAL', false)" width="85%" title="小区综合治理管理要素">
      <IssueDetail />
@@ -193,7 +193,7 @@ export default {
  },
  data() {
    return {
-      test: true,
+      hide3d: true,
      map: null,
      mapConfig: {
        resizeEnable: true,
@@ -734,7 +734,7 @@ export default {
        }
      })
    }
-    const buildingLayer = new AMap.Buildings({zIndex: 130, opacity: 0.7, merge: false, sort: false, zooms: [10,20]})
+    const buildingLayer = new AMap.Buildings({zIndex: 130, opacity: 0.8, merge: false, sort: false, zooms: [10,20]})
    buildingLayer.setStyle(buildingOptions)
    this.map.setLayers([
      new AMap.TileLayer(), // 高德默认的地图图层
@@ -744,10 +744,11 @@ export default {
    const polygon = paths.map(path => {
      return new AMap.Polygon({
        zIndex: 1,
-        strokeWeight: 4,
+        strokeWeight: 3,
        path: path,
        fillOpacity: 0.3,
-        fillColor: '#87ceeb',
+        // fillColor: '#87ceeb',
+        fillColor: '#e6d74e',
        strokeColor: '#e6d74e',
      })
    })
@@ -756,8 +757,8 @@ export default {
      position: [121.509859, 31.196088],
      zIndex: 99,
      icon: new AMap.Icon({
-        size: [15 * this.sizeRate, 20 * this.sizeRate],
+        size: [16 * this.sizeRate, 20 * this.sizeRate],
-        image: require('@/assets/images/warn.png'),
+        image: require('@/assets/images/no-warn.png'),
      }),
    })
    this.map.add(marker)
@@ -962,7 +963,7 @@ export default {
    '$store.state.sensorList': {
      handler(cur) {
        this.clearPoints()
-        this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'no-warn.png'})
+        this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'icon6.png'})
      }
    },
  }

--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -699,7 +699,7 @@ export default {
    '$store.state.sensorList': {
      handler(cur) {
        this.clearPoints()
-        this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'no-warn.png'})
+        this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'icon6.png'})
      }
    },
    emergencyMode(cur) {