Merge branch 'master' of http://git.omniview.pro/yaominguo/east-nanjing-new

dist/assets/map-btn5.65d5e714.js

-import{d as e,p as a,a as r,r as t,o as l,b as o,F as s,f as n,l as d,e as k,t as u,w as i,g as c,h as f,c as y,j as v}from"./index.3b29ff34.js";var A=e({name:"Brief",props:{list:{type:Array,required:!0},color:{type:String,default:null},size:{type:String,default:"0.22rem"}}});const p=i("data-v-074669a4");a("data-v-074669a4");const z={class:"brief-container"},h={key:1},m={class:"count-group"},w=c(" / ");r();const g=p(((e,a,r,i,c,f)=>{const y=t("m-count");return l(),o("div",z,[(l(!0),o(s,null,n(e.list,(a=>(l(),o("div",{key:a.name},[a.icon?(l(),o("img",{key:0,src:a.icon,style:`width:${e.size};height:${e.size}`},null,12,["src"])):d("",!0),Array.isArray(a.value)?(l(),o("div",h,[k("div",m,[k(y,{class:"count yellow",value:a.value[0]},null,8,["value"]),w,k(y,{class:"count",value:a.value[1]},null,8,["value"])]),k("p",null,u(a.name),1)])):(l(),o("div",{key:2,class:{center:!a.icon}},[k(y,{class:"count yellow",style:{color:e.color},value:a.value},null,8,["style","value"]),k("p",null,u(a.name),1)],2))])))),128))])}));A.render=g,A.__scopeId="data-v-074669a4";var F=e({name:"Circle",props:{type:{type:String,default:"circle"},color:{type:[String,Array],default:["#0094FF","#1DF9FF"]},value:{type:Number,default:0},name:{type:String,default:""},showInfo:{type:Boolean,default:!0},rate:{type:Number,default:1.8},strokeWidth:{type:Number,default:6},gapDegree:{type:Number,default:0}},setup(e){const a=f(null),r=y((()=>Array.isArray(e.color)?{"0%":e.color[0],"100%":e.color[1]}:e.color)),t=y((()=>a.value?a.value.clientWidth/(e.rate||1.8):0));return{circleWrapperRef:a,strokeColor:r,width:t}}});const b=i("data-v-fb0eadd2");a("data-v-fb0eadd2");const N={ref:"circleWrapperRef",class:"circle-wrapper"};r();const j=b(((e,a,r,s,n,d)=>{const i=t("a-progress");return l(),o("div",N,[k(i,{width:e.width,"stroke-color":e.strokeColor,percent:e.value,type:e.type,"show-info":e.showInfo,"stroke-width":e.strokeWidth,"gap-degree":e.gapDegree},null,8,["width","stroke-color","percent","type","show-info","stroke-width","gap-degree"]),v(e.$slots,"default",{},(()=>[k("p",null,u(e.name),1)]))],512)}));F.render=j,F.__scopeId="data-v-fb0eadd2";var S="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAhFBMVEUykf8zkv8zkf8ykv8zkf8zkf8xkv80kv8zkv8zkv8zkf8ykf8zkf8ykv8zkv8ykf8ykf8zkf8ykf8zkf8ykf8ykf8zkv8ykv8zkf8zkf8zkv8zkf8zkv80kv8zkf8ykv8zkv8ykf8ukv8wkP8zkv8ykf8ykv8zkf8ykv8xk/8ykv8zkf9rRIMBAAAAK3RSTlMz18NK/Ow643ht+PWQ28xmsayllopyVz7x0reDXETWnH1RNjXh38a8Y049lTPWQgAAAgNJREFUSMftl+tysjAQhoWAgpyPogiK5357//f35Q2h2tYJUacz7Uz3T9YlD/smm4NM2IyetBmbgH2WnhBNnjSiP/j3w1M3OR0re3n23x6FWezRuwXOI/A0ndMHay/aMDPos1m5Jry2+/6h70RFHds9nmjBzBZo2gyB4ijojQY8FZqP3U1otxG0Mw6n6Bcu5Jtk0LF40GvGYDZHXsFGZ4+sIBN+jlemY3CM8XZIuqLe7AjxFeJMDU/nMsPudC1TNCjy1XCBzhhbRlezoTzhzlINQ3XI24WHGfJLNwSd8YgLp1HCoRTnQMFliAQYB3SvlfBB1nPTK5AZLTgzPFLCUHuR1V6JSAm5qPeSt7kSxtJ0eetjnoAIr4ITcGerhFveo8bmIKTmdAQtZzyq8F4lbA77ZwnaPouGRKHhlApYyoWzvjkOVsMCrfZKuKNBXPFOn8TYsdnikbUdoKx7kbuX7GXi1xZ+MQJvhxUF3E83zr/rCRGM7mdDprhzQrijcGRhSdUfYqwFa2qcYXk/w+xmKDYih8U4jJ0FmyfRTmTNDYJVnd65jV0h+ENo2NI/dLo3xtajT2Yu9O+qJrFu0cB97JZ8y1pJVnGxf/x+bi5OXrvl7rf8M6jNr5YwPdihe2bowSbdtVILPr0C13fZ2V5vwrLW+GJm+ePr/Ad/F/zSR9lLn4P/AQwwqd82rS6wAAAAAElFTkSuQmCC";export{A as _,F as a,S as b};

dist/assets/zoom-out.78231dd8.js

+import{d as e,p as A,a,r as t,o as l,b as k,F as r,f as s,l as o,e as f,t as y,w as n,g as i,h as v,c,j as u}from"./index.51cd1636.js";var p=e({name:"Brief",props:{list:{type:Array,required:!0},color:{type:String,default:null},size:{type:String,default:"0.22rem"}}});const z=n("data-v-074669a4");A("data-v-074669a4");const d={class:"brief-container"},g={key:1},w={class:"count-group"},B=i(" / ");a();const h=z(((e,A,a,n,i,v)=>{const c=t("m-count");return l(),k("div",d,[(l(!0),k(r,null,s(e.list,(A=>(l(),k("div",{key:A.name},[A.icon?(l(),k("img",{key:0,src:A.icon,style:`width:${e.size};height:${e.size}`},null,12,["src"])):o("",!0),Array.isArray(A.value)?(l(),k("div",g,[f("div",w,[f(c,{class:"count yellow",value:A.value[0]},null,8,["value"]),B,f(c,{class:"count",value:A.value[1]},null,8,["value"])]),f("p",null,y(A.name),1)])):(l(),k("div",{key:2,class:{center:!A.icon}},[f(c,{class:"count yellow",style:{color:e.color},value:A.value},null,8,["style","value"]),f("p",null,y(A.name),1)],2))])))),128))])}));p.render=h,p.__scopeId="data-v-074669a4";var m=e({name:"Circle",props:{type:{type:String,default:"circle"},color:{type:[String,Array],default:["#0094FF","#1DF9FF"]},value:{type:Number,default:0},name:{type:String,default:""},showInfo:{type:Boolean,default:!0},rate:{type:Number,default:1.8},strokeWidth:{type:Number,default:6},gapDegree:{type:Number,default:0}},setup(e){const A=v(null),a=c((()=>Array.isArray(e.color)?{"0%":e.color[0],"100%":e.color[1]}:e.color)),t=c((()=>A.value?A.value.clientWidth/(e.rate||1.8):0));return{circleWrapperRef:A,strokeColor:a,width:t}}});const D=n("data-v-fb0eadd2");A("data-v-fb0eadd2");const S={ref:"circleWrapperRef",class:"circle-wrapper"};a();const U=D(((e,A,a,r,s,o)=>{const n=t("a-progress");return l(),k("div",S,[f(n,{width:e.width,"stroke-color":e.strokeColor,percent:e.value,type:e.type,"show-info":e.showInfo,"stroke-width":e.strokeWidth,"gap-degree":e.gapDegree},null,8,["width","stroke-color","percent","type","show-info","stroke-width","gap-degree"]),u(e.$slots,"default",{},(()=>[f("p",null,y(e.name),1)]))],512)}));m.render=U,m.__scopeId="data-v-fb0eadd2";var E="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAXVBMVEUykf8ykf80kf8wkf8zkf80kf8zkv80kv8zkf8zkv8ykf8ykf8ykf8zkv8ykv8zkf80kv8zkf8ykP8zkf8wkf8ykf8xkP8zkf80k/8zkf8zkf81kv8zk/8ykv8zkf/dH+VkAAAAHnRSTlMz3/s69U9I5O7n2/LHbWjO6NSK0V5WU0FApJCDeE2m+wgLAAAA20lEQVRIx+3XyQ6CMBSF4VJawEqZwfm8/2NKjcQFNB2IiMq/uSHhW92SUBLF8CyOSG+9NQGIZ8CGN+yGZYHJgsYCF9BUW2Do2lliOsoe09E70Rfh8NUNQDE8WODrHprixoh7qys14RD6AivMJrLFjIzj/4AvLJFqVjTJnDEDhHqmQOmKD/1MhtPtio9zMEmA/HlcU2ecibxVU4q8W3jPwwcceuCKMqnmme6lKw7pGvYcL7znOu0es0z5+/fMOW8V5uMyAzb0SSy0+BSYEtUK/4Y2/Lt4zqVs1nXwDgeteZHQ3Mt5AAAAAElFTkSuQmCC",N="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAeFBMVEUykf8wkv8zkv8zkf8zkv8xkv8ykf8zkv8ykf8ykf8zkf8zkv8ykv8zkf8zkf8zkf8ykv8zkv8yk/8zkf8ykf8ykf8ykf8zkv8zkv8zkv8zkf8zkf8ykf8ykv8zkv8zkf8ykv8ykf8ykf8ykf8ykf8ykv8ykf8zkf9v7YFHAAAAJ3RSTlMzN+NWWzr0vGDu59PFgc7JSvJO++u3s6lS266jnj33lnGOe0PXiGaE5hPKAAAB0UlEQVRIx+3XYZeiIBQG4ItKWojVmGtqqWnF//+HO5eRiBB2x/m0e3q/2DnwJF7goLALxMIEO0C7VIMQsDBCvPEbY8J4s07vyzDPBab5LqaXbRajxdR/xjQJifr9UU1OaT8+15+dVjeQIQ/b9CupvZhchUxM4NxleqfGkEj9y4e7R+9wI2QYl6ogSrsx+2xfywKpKmUk2hvajbE9CtfiKTFqqZR2YaxQSibNhv2zjpR24ZN40gyvWocw6YLMYxpITb9UqjSEVXsCeOh5DMcDtm4pXrVOQOXrCZp5DB+bGR3Bi+5N7NL0yPY4Yq1x5FcTu3QJr7mpB9HYpSuwgku4c2Ct8drYuMEJMLGtMzpeBrDDsc3Ctoa5DDgsD54O3ew8hztco27s14W3YH5NW7VKNPZou1574sURv5UCw140xVrW4MFjLGTMNaZ3beTBZCt0mNF0z2WtPXgQT7kYJw9ui9VoYnsygrioy1N3SYz7yu3NwYdTeUM7txztCby4xj4tK3lIQKevpgPAjyOBUf9w343jsW+CqfjEhfV8ONLyvzhie5bP2W0EHqxDIl6y1qBp8q3DnYRDk14PIj9UBd8te6Eh/+Sr1Bv/J/gnH2U/+hz8DZ7FnVP8+fiDAAAAAElFTkSuQmCC",C="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8BAMAAADI0sRBAAAAElBMVEUykf8ykP8zkv80kv80k/8zkf825nviAAAABXRSTlMz65/jSamIpAgAAABkSURBVDjLY3AOxQNMGEzxSQczhDLgAaGj0rSXZhJUwCetGhqET1o0NBCfNDCOR6VJkFZEyR5CaNJMaNlHAVWaEU1agIA0AcPxO20whdpQlwZmInKyICIDD9ayZeRI46/mCFSSAPzEgRk4Bsk7AAAAAElFTkSuQmCC",M="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8BAMAAADI0sRBAAAAElBMVEUykf8ykP80kv8zkv80k/8zkf8mH/+kAAAABXRSTlMz6+OfSXfpA8YAAABHSURBVDjLY3AKxQNUGFTxSQcxhDLgAaGj0qPSI0raECV7CKNJM6NlHwNUaUY0aQEC0gQMx++0wRRqo9Kj0gMrTaCaI1BJAgAZlmm5TBaU5QAAAABJRU5ErkJggg==";export{p as _,m as a,C as b,M as c,E as d,N as e};

dist/index.html

@@ -6,9 +6,9 @@
   <link rel="icon" href="./favicon.ico" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>南京东路街道</title>
-<script type="module" crossorigin src="./assets/index.3b29ff34.js"></script>
+<script type="module" crossorigin src="./assets/index.51cd1636.js"></script>
   <link rel="modulepreload" href="./assets/vendor.3a6a5816.js">
-  <link rel="stylesheet" href="./assets/index.21162620.css">
+  <link rel="stylesheet" href="./assets/index.b5a0d8aa.css">
 </head>
 
 <body>

src/view/community.vue

@@ -105,11 +105,9 @@
             <p>整改后</p>
             <img
               :src="
-                drawerInfo.afterPhoto.replace(
-                  'http://zhongbang.omniview.pro/' ||
-                    'https://zhongbang.omniview.pro/',
-                  prefix
-                )
+                drawerInfo.afterPhoto
+                  .split(',')[0]
+                  .replace('https://zhongbang.omniview.pro/', prefix)
               "
             />
           </div>
@@ -117,11 +115,9 @@
             <p>整改前</p>
             <img
               :src="
-                drawerInfo.beforPhoto.replace(
-                  'http://zhongbang.omniview.pro/' ||
-                    'https://zhongbang.omniview.pro/',
-                  prefix
-                )
+                drawerInfo.beforPhoto
+                  .split(',')[0]
+                  .replace('https://zhongbang.omniview.pro/', prefix)
               "
             />
           </div>
@@ -163,9 +159,6 @@ export default defineComponent({
         rotation.value = 0
       }
       map.value.rotate(rotation.value)
-      setTimeout(() => {
-        focusCenterAndAddLayer()
-      }, 1000)
       // map.value.cameraTo({ heading: rotation.value })
     }
     const loading = ref(true)
@@ -238,9 +231,10 @@ export default defineComponent({
     const showDrawer = ref(false)
     const drawerInfo = ref<any>({})
     const handleMapClick = (e: any) => {
-      console.log('point-data: ', e)
-      drawerInfo.value = e
-      showDrawer.value = true
+      if (e.classification === '微更新') {
+        drawerInfo.value = e
+        showDrawer.value = true
+      }
     }
     const isCommunityPointsShowNow = ref(false)
     async function showCommunityPoints() {

src/view/community/community-photo.vue

@@ -5,10 +5,7 @@
       :key="item.name"
       :style="`background:url(${
         item.photo &&
-        item.photo.replace(
-          'http://zhongbang.omniview.pro/' || 'https://zhongbang.omniview.pro/',
-          prefix
-        )
+        item.photo.replace('http://zhongbang.omniview.pro/', prefix)
       }) 100% / 100% 100% no-repeat`"
       @click="handleClick(item.video)"
     >

src/view/hooks/useSwitchMap.ts

@@ -44,18 +44,22 @@ export default function useSwitchMap(map: any) {
     switch (type) {
       case 'work1':
         show && showPoints({ gridId: store.state.workArea1.id })
+        map.value.addBoundary({ name: '第一工作站', color: 'rgba(0,0,0,0)' })
         map.value.focus(...store.state.workArea1.center, 8)
         break
       case 'work2':
         show && showPoints({ gridId: store.state.workArea2.id })
+        map.value.addBoundary({ name: '第二工作站', color: 'rgba(0,0,0,0)' })
         map.value.focus(...store.state.workArea2.center, 8)
         break
       case 'work3':
         show && showPoints({ gridId: store.state.workArea3.id })
+        map.value.addBoundary({ name: '第三工作站', color: 'rgba(0,0,0,0)' })
         map.value.focus(...store.state.workArea3.center, 8)
         break
       case 'street':
         show && showPoints()
+        map.value.addBoundary({ name: '南京东路街道', color: 'rgba(0,0,0,0)' })
         map.value.focus(207.9006154792994, 71.67111885454233, 8)
         break
       default:
@@ -71,7 +75,6 @@ export default function useSwitchMap(map: any) {
   }
 
   const handleMapComplete = async () => {
-    map.value.addBoundary({ name: '南京东路街道', color: 'rgba(0,0,0,0)' })
     setPoints(curViewType.value)
     if (curMapType.value === '3D') {
       if (curViewType.value === 'work1') {