调回页面

d5f5e676 · 郭铭瑶 · b623e3cc · d5f5e676 · d5f5e676 · d5f5e676
Commit d5f5e676 authored Sep 05, 2020 by 郭铭瑶 🤘
33 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.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>
+      }</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.0a42f2e9b8b216f729cbf3c93d14794c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fa3038923f93859c711c.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.0a42f2e9b8b216f729cbf3c93d14794c.css
+++ b/dist/static/css/app.0a42f2e9b8b216f729cbf3c93d14794c.css
--- a/dist/static/css/app.0a42f2e9b8b216f729cbf3c93d14794c.css.map
+++ b/dist/static/css/app.0a42f2e9b8b216f729cbf3c93d14794c.css.map
--- a/dist/static/css/app.f581fe0f46c2378cb98f64cd9ad651d4.css
+++ b/dist/static/css/app.f581fe0f46c2378cb98f64cd9ad651d4.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/3d.1a936e3.png
+++ b/dist/static/img/3d.1a936e3.png
--- a/dist/static/img/discover-done.0305166.png
+++ b/dist/static/img/discover-done.0305166.png
--- a/dist/static/js/0.f95e627fa2b7205457c8.js
+++ b/dist/static/js/0.f95e627fa2b7205457c8.js
--- a/dist/static/js/0.b4ba89cb398e7ddd33d2.js.map
+++ b/dist/static/js/0.b4ba89cb398e7ddd33d2.js.map
--- a/dist/static/js/0.f95e627fa2b7205457c8.js.map
+++ b/dist/static/js/0.f95e627fa2b7205457c8.js.map
--- a/dist/static/js/2.817426aae3d570ed42ad.js.map
+++ b/dist/static/js/2.817426aae3d570ed42ad.js.map
--- a/dist/static/js/2.817426aae3d570ed42ad.js
+++ b/dist/static/js/2.817426aae3d570ed42ad.js
--- a/dist/static/js/2.b956a254090d608c2539.js.map
+++ b/dist/static/js/2.b956a254090d608c2539.js.map
--- a/dist/static/js/23.9d67aeb891284656ae08.js.map
+++ b/dist/static/js/23.9d67aeb891284656ae08.js.map
--- a/dist/static/js/23.9d67aeb891284656ae08.js
+++ b/dist/static/js/23.9d67aeb891284656ae08.js
--- a/dist/static/js/23.ab51b349f58994409b34.js.map
+++ b/dist/static/js/23.ab51b349f58994409b34.js.map
--- a/dist/static/js/4.5abb74ba424b54ffd832.js
+++ b/dist/static/js/4.5abb74ba424b54ffd832.js
--- a/dist/static/js/4.5abb74ba424b54ffd832.js.map
+++ b/dist/static/js/4.5abb74ba424b54ffd832.js.map
--- a/dist/static/js/4.a0223cdec419a43c72b2.js
+++ b/dist/static/js/4.a0223cdec419a43c72b2.js
--- a/dist/static/js/4.a0223cdec419a43c72b2.js.map
+++ b/dist/static/js/4.a0223cdec419a43c72b2.js.map
--- 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}}([]);
+!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],t[b]&&u.push(t[b][0]),t[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=a(a.s=o[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],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+e+"."+{0:"b4ba89cb398e7ddd33d2",1:"80f3e7aa96153395fe1b",2:"b956a254090d608c2539",3:"858079b6f37c68e0f6a5",4:"5abb74ba424b54ffd832",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:"ab51b349f58994409b34",24:"f7914065b4d7bec4ccfb",25:"6b5f4749058978064562",26:"584ddfc7aad303eb351f"}[e]+".js";var f=setTimeout(b,12e4);function b(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=b,c.appendChild(o),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.73a5f532af71066b89a7.js.map
+//# sourceMappingURL=manifest.fa3038923f93859c711c.js.map
\ No newline at end of file
--- a/dist/static/js/manifest.73a5f532af71066b89a7.js.map
+++ b/dist/static/js/manifest.73a5f532af71066b89a7.js.map
--- a/src/assets/css/variables.styl
+++ b/src/assets/css/variables.styl
@@ -28,17 +28,10 @@ $selected()
  box-sizing border-box
  border 0.1rem solid $edgeColor
  background-color rgba(0,242,255,0.1)
-// $fontColor = #70A7E0
+$fontColor = #70A7E0
-// $edgeColor = #00f2ff
+$edgeColor = #00f2ff
 // $cardBg = rgba(53, 119, 248, 0.15)
-// $cardBg = rgba(18, 34, 66, 0.8)
+$cardBg = rgba(18, 34, 66, 0.8)
-// $cardBorder = 0.1rem solid #308bd8
-// $cardFontColor = #5bd5ff
-$cardBg = rgba(0,0,0,0.2)
-$cardBorder = 0.1rem solid #000
-$edgeColor = #4fffc6
-$fontColor = #fff
-$cardFontColor = #fff
+$cardBorder = 0.1rem solid #308bd8
+$cardFontColor = #5bd5ff
--- a/src/assets/images/2d3d.png
+++ b/src/assets/images/2d3d.png
--- a/src/assets/images/3d.png
+++ b/src/assets/images/3d.png
--- a/src/assets/images/discover-done.png
+++ b/src/assets/images/discover-done.png
--- a/src/assets/images/discover-todo.png
+++ b/src/assets/images/discover-todo.png
--- a/src/components/MonitorComponents/MonitorCard/mode4.vue
+++ b/src/components/MonitorComponents/MonitorCard/mode4.vue
@@ -77,8 +77,8 @@ export default {
 </script>
 <style lang="stylus" scoped>
-// $color = #308bd8
+$color = #308bd8
-$color = transparent
+// $color = transparent
 .card-wrapper
  padding 0 !important
  position relative
@@ -143,7 +143,7 @@ $color = transparent
          height 1rem
          opacity .5
  .card-content
-    $blur(.2rem)
+    $blur()
    position relative
    background $cardBg
    border .1rem solid $color

--- a/src/views/components/map-menu.vue
+++ b/src/views/components/map-menu.vue
 <template>
  <div class="map-menu" :style="style">
-    <img @click="$emit('3d')" src="@/assets/images/2d3d.png"/>
+    <img v-show="$route.name === 'linyiercun'" @click="handleClick" :src="require(`@/assets/images/${cur}.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"/>
@@ -17,6 +17,11 @@ export default {
      default: false,
    }
  },
+  data() {
+    return {
+      cur: '2d',
+    }
+  },
  computed: {
    style() {
      if (this.full) {
@@ -30,6 +35,12 @@ export default {
        bottom: '0',
      }
    }
+  },
+  methods: {
+    handleClick() {
+      this.$emit('3d')
+      this.cur = (this.cur === '2d' ? '3d' : '2d')
+    },
  }
 }
 </script>

--- a/src/views/linyi copy.vue
+++ b/src/views/linyi copy.vue
@@ -748,15 +748,15 @@ export default {
        const doneList = [], todoList = []
        JSON.parse(JSON.stringify(handleList)).forEach(item => {
          if(item.done_time) {
-            item.icon = 'discover-done.png'
+            item.icon = 'icon9.png'
            doneList.push(item)
          } else {
-            item.icon = 'discover-todo.png'
+            item.icon = 'icon8.png'
            todoList.push(item)
          }
        })
        setTimeout(() => {
-          map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'discover-done.png'})
+          map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'icon9.png'})
          map.focus(3706.690186, -4234.159912, 8.5)
        }, 1000)
      }

--- a/src/views/linyi.vue
+++ b/src/views/linyi.vue
@@ -2,7 +2,7 @@
 <div style="width:100%;height:100vh;">
  <div class="border left"/>
  <div class="border right"/>
-  <m-animate enter="zoomInRight" leave="zoomOutRight">
+  <m-animate enter="zoomInUp" leave="zoomOutDown">
    <div v-show="!hide3d" id="linyiMap"/>
  </m-animate>
  <m-grid
@@ -21,7 +21,7 @@
    style="padding: 0.5rem;"
    :complete="complete"
  >
-    <m-animate enter="zoomInLeft" leave="zoomOutLeft">
+    <m-animate enter="zoomInUp" leave="zoomOutDown">
      <m-map v-show="hide3d" ref="map" @event="handleMapClick" @complete="mapComplete" />
    </m-animate>
    <m-animate enter="fadeInDown" leave="fadeOutUp">
@@ -207,7 +207,8 @@ export default {
        buildingAnimation:true, // 楼块出现是否带动画
        expandZoomRange:true,
        zooms: [10,20],
-        center: [121.511785, 31.194485],
+        center: [121.511785, 31.196088],
+        // center: [121.511785, 31.194485],
        showIndoorMap: false,
        mapStyle:'amap://styles/grey',
        features: ['bg', 'road', 'building'],
@@ -947,15 +948,15 @@ export default {
        const doneList = [], todoList = []
        JSON.parse(JSON.stringify(handleList)).forEach(item => {
          if(item.done_time) {
-            item.icon = 'discover-done.png'
+            item.icon = 'icon9.png'
            doneList.push(item)
          } else {
-            item.icon = 'discover-todo.png'
+            item.icon = 'icon8.png'
            todoList.push(item)
          }
        })
        setTimeout(() => {
-          map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'discover-done.png'})
+          map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'icon9.png'})
          map.focus(3706.690186, -4234.159912, 8.5)
        }, 1000)
      }
@@ -963,7 +964,7 @@ export default {
    '$store.state.sensorList': {
      handler(cur) {
        this.clearPoints()
-        this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'icon6.png'})
+        this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 20, data: cur, icon: 'icon6.png'})
      }
    },
  }
@@ -1003,6 +1004,7 @@ export default {
  //   z-index 8
  // }
 .icon-wrapper
+  z-index 999
  position fixed
  bottom 22%
  left 28%

--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -683,15 +683,15 @@ export default {
        const doneList = [], todoList = []
        JSON.parse(JSON.stringify(handleList)).forEach(item => {
          if(item.done_time) {
-            item.icon = 'discover-done.png'
+            item.icon = 'icon9.png'
            doneList.push(item)
          } else {
-            item.icon = 'discover-todo.png'
+            item.icon = 'icon8.png'
            todoList.push(item)
          }
        })
        setTimeout(() => {
-          map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'discover-done.png'})
+          map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'icon9.png'})
          map.focus(3706.690186, -4234.159912, 8.5)
        }, 1000)
      }