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

.env.production

+NODE_ENV = production
\ No newline at end of file

.env.test

+NODE_ENV = test
\ No newline at end of file

dist/assets/zoom-out.76240382.css

-.brief-container[data-v-074669a4]{display:flex;align-items:center;white-space:nowrap}.brief-container .count[data-v-074669a4]{font-size:.11rem}.brief-container .count.yellow[data-v-074669a4]{font-size:.13rem;color:#ffd400}.brief-container>div[data-v-074669a4]{display:flex;align-items:center;flex:1;margin-left:.05rem}.brief-container>div>img[data-v-074669a4]{margin-right:.05rem}.brief-container>div>div[data-v-074669a4]{font-weight:700}.brief-container>div>div p[data-v-074669a4]{color:#ccc}.brief-container>div>div.center[data-v-074669a4]{text-align:center}.circle-wrapper[data-v-fb0eadd2]{width:100%;height:100%;box-sizing:border-box;display:flex;align-items:center;justify-content:center;flex-direction:column;position:relative}.circle-wrapper>p[data-v-fb0eadd2]{margin-top:.1rem;font-size:.12rem;font-weight:700}
\ No newline at end of file

dist/assets/zoom-out.c0297691.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.30006334.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

-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="UTF-8">
-  <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.30006334.js"></script>
-  <link rel="modulepreload" href="./assets/vendor.3a6a5816.js">
-  <link rel="stylesheet" href="./assets/index.ef1ef3e3.css">
-</head>
-
-<body>
-  <div id="app"></div>
-  <script src="./SMap.min.js"></script>
-  <script src="./Plugins.min.js"></script>
-  <script src="./hls.js"></script>
-  
-</body>
-
-</html>
\ No newline at end of file

package.json

@@ -6,8 +6,8 @@
   "scripts": {
     "dev": "vite",
     "start": "npm run dev",
-    "clean": "rimraf ./dist",
-    "build": "npm run clean && vuedx-typecheck . && vite build"
+    "build": "vuedx-typecheck . && vite build --mode test",
+    "build:pro": "vuedx-typecheck . && vite build --mode production"
   },
   "dependencies": {
     "animate.css": "^4.1.1",

src/ajax/api.ts

 let BASE_URL = ''
+let SOURCE_URL = ''
 switch (process.env.NODE_ENV) {
   case 'production':
-    BASE_URL = '/nd-api' // 设置代理
+    // 政务网生产环境，设置了代理api
+    BASE_URL = '/nd-api'
+    SOURCE_URL = 'http://10.81.71.243:23456/nd-file/'
+    break
+  case 'test':
+    // 普通打包（测试用）
+    BASE_URL = 'http://nandong-dev.omniview.pro/api'
+    SOURCE_URL = 'http://zhongbang.omniview.pro/'
     break
   default:
+    // 开发环境
     BASE_URL = '/api'
+    SOURCE_URL = 'http://zhongbang.omniview.pro/'
 }
 
 export default {
   BASE_URL,
-  SOURCE_URL: 'http://10.81.71.243:23456/nd-file/', // 设置代理
+  SOURCE_URL,
   GET_BUILDING: '/service-basicdatasync-ddd/building', // 门牌幢列表
   GET_INDUSTRY_AUTHORITY: '/service-basicdatasync-ddd/indCous', // 业委会列表
   GET_COMMITTEE: '/service-basicdatasync-ddd/residentsCommittees', // 居委会列表

src/view/components/map.ts

-// declare const SMap: any
-// declare const Plugins: any
-
-// export interface ConfigProp {
-//   el: string
-//   options: MapOptionsProp
-//   sources: string[]
-// }
-
-// export interface MapOptionsProp {
-//   viewMode?: string
-//   center?: number[]
-//   zooms?: number[]
-//   zoom?: number
-//   pitch?: number
-//   mapStyle?: string
-//   showBuildingBlock?: boolean
-// }
-
-// class Map {
-//   map: any
-//   config: ConfigProp
-//   constructor(config: ConfigProp) {
-//     this.config = config
-//   }
-//   injectSource(): Promise<unknown[]> {
-//     const promises = this.config.sources.map(
-//       (source: string, index: number) => {
-//         return new Promise((resolve) => {
-//           if (document.getElementById(`_source${index}`)) {
-//             resolve(true)
-//             return
-//           }
-//           const sourceJs = document.createElement('script')
-//           sourceJs.type = 'text/javascript'
-//           sourceJs.src = source
-//           sourceJs.setAttribute('id', `_source${index}`)
-//           document.head.appendChild(sourceJs)
-//           window.onload = () => resolve(true)
-//         })
-//       }
-//     )
-//     return Promise.all(promises)
-//   }
-// }
-
-// export class S_Map extends Map {
-//   constructor(config: ConfigProp) {
-//     super(config)
-//     this.injectSource().then(this.initMap)
-//   }
-//   initMap(): void {
-//     this.map = new SMap.Map(this.config.el, this.config.options)
-//   }
-//   onLoaded(cb: (arg: unknown) => void): void {
-//     this.map.on(SMap.MapEvent.maploaded, cb)
-//   }
-//   onZoomChange(cb: (arg: unknown) => void): void {
-//     this.map.on(SMap.MapEvent.zoomchanged, cb)
-//   }
-//   onCenterChange(cb: (arg: unknown) => void): void {
-//     this.map.on(SMap.MapEvent.centerchanged, cb)
-//   }
-//   onBlur(cb: (arg: unknown) => void): void {
-//     this.map.on(SMap.MapEvent.blur, cb)
-//   }
-//   onFocus(cb: (arg: unknown) => void): void {
-//     this.map.on(SMap.MapEvent.focus, cb)
-//   }
-//   onDrag(cb: (arg: unknown) => void): void {
-//     this.map.on(SMap.MapEvent.drag, cb)
-//   }
-//   onClick(cb: (arg: unknown, point: unknown) => void): void {
-//     this.map.on(SMap.MapEvent.click, (view: any, eventParamter: any) => {
-//       view.hitTest(eventParamter).then((res: any) => {
-//         if (res.results && res.results.length > 0) {
-//           cb(
-//             res.results[0] && res.results[0].graphic.attributes,
-//             eventParamter.mapPoint
-//           )
-//         }
-//       })
-//     })
-//   }
-// }

src/view/hooks/useSwitchMap.ts

@@ -37,42 +37,42 @@ export default function useSwitchMap(map: any) {
       store.commit('SET_MAP_TYPE', '2D')
     }
   )
-  const boundary = ref<any>(null)
+  let boundary = null
   // 根据条件显示小区点和添加边界
   function setPointsAndBoundary(type: string) {
-    boundary.value && map.value.remove(boundary.value)
+    boundary && boundary.remove()
     const show = store.state.showCommunityPoints
     switch (type) {
       case 'work1':
         show && showPoints({ gridId: store.state.workArea1.id })
-        boundary.value = map.value.addBoundary({
-          type: 'njdljd_boundary',
-          name: '第一工作站',
+        boundary = map.value.addBoundary({
+          type: 'jwh_boundary',
+          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 })
-        boundary.value = map.value.addBoundary({
-          type: 'njdljd_boundary',
-          name: '第二工作站',
+        boundary = map.value.addBoundary({
+          type: 'jwh_boundary',
+          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 })
-        boundary.value = map.value.addBoundary({
-          type: 'njdljd_boundary',
-          name: '第三工作站',
+        boundary = map.value.addBoundary({
+          type: 'jwh_boundary',
+          name: '第三',
           color: 'rgba(0,0,0,0)',
         })
         map.value.focus(...store.state.workArea3.center, 8)
         break
       case 'street':
         show && showPoints()
-        boundary.value = map.value.addBoundary({
+        boundary = map.value.addBoundary({
           name: '南京东路街道',
           color: 'rgba(0,0,0,0)',
         })