修改,打包

dist/assets/zoom-out.3f181ede.js → dist/assets/zoom-out.045220d5.js

-import{d as e,p as A,a,r,o as l,b as t,F as s,f as o,g as k,e as n,t as f,w as c,j as i,h as y,c as u,y as d}from"./index.63c19453.js";var g=e({name:"Brief",props:{list:{type:Array,required:!0},color:{type:String,default:null},size:{type:String,default:"0.22rem"},align:{type:String,default:"horizontal"}}});const p=c("data-v-42bff056");A("data-v-42bff056");const v={key:1},z={class:"count-group"},w=i(" / ");a();const m=p(((e,A,a,c,i,y)=>{const u=r("m-count");return l(),t("div",{class:["brief-container",{vertical:"vertical"===e.align}]},[(l(!0),t(s,null,o(e.list,(A=>(l(),t("div",{key:A.name},[A.icon?(l(),t("img",{key:0,src:A.icon,style:`width:${e.size};height:${e.size}`},null,12,["src"])):k("",!0),Array.isArray(A.value)?(l(),t("div",v,[n("div",z,[n(u,{class:"count orange-count",value:A.value[0],style:{color:e.color}},null,8,["value","style"]),w,n(u,{class:"count",value:A.value[1]},null,8,["value"])]),n("p",null,f(A.name),1)])):(l(),t("div",{key:2,class:{center:!A.icon}},[n(u,{class:"count",style:{color:e.color},value:A.value},null,8,["style","value"]),n("p",null,f(A.name),1)],2))])))),128))],2)}));g.render=m,g.__scopeId="data-v-42bff056";var S=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=y(null),a=u((()=>Array.isArray(e.color)?{"0%":e.color[0],"100%":e.color[1]}:e.color)),r=u((()=>A.value?A.value.clientWidth/(e.rate||1.8):0));return{circleWrapperRef:A,strokeColor:a,width:r}}});const U=c("data-v-4d97637b");A("data-v-4d97637b");const E={ref:"circleWrapperRef",class:"circle-wrapper"};a();const h=U(((e,A,a,s,o,k)=>{const c=r("a-progress");return l(),t("div",E,[n(c,{"class-name":"circle-progress",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,"trail-color":"rgba(255,255,255,0.1)"},null,8,["width","stroke-color","percent","type","show-info","stroke-width","gap-degree"]),d(e.$slots,"default",{},(()=>[n("p",null,f(e.name),1)]))],512)}));S.render=h,S.__scopeId="data-v-4d97637b";var B="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAP1BMVEUykf8ykf8ykf80kv8yk/8zkf8zkf8xkP8xkf8zkf8zkv8ykv8ykf8zkv8ykf80k/8zkv8zk/8zkf8zkf8zkf/igqmIAAAAFHRSTlMzmWbjSvOlc1/t2cG3jVY7zItaQXkfsHMAAAC2SURBVEjH7dfJCsMgFIVhbZwyT+f9n7VdFRe5HkywpMF//6EoiirT4GSNUbLlWgHqZEDFFZ/AzuIw6zj2EPMUrzJeKTZWstZQrMyoDxtN2dWew0sszGk8tUjUTkk8INlQCvNpl1swnoy9JnkZO9CciC3HVsQArxzWSkw/HYfxe4WEXOwR5TNxH+M+E7sYu0y899HA+/9s1e/xosUWfLrhee647US8ddRud30NVfxIfOVTduk7+AYjTFmjwJvA3AAAAABJRU5ErkJggg==",M="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,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8BAMAAADI0sRBAAAAElBMVEUykf8ykP8zkv80kv80k/8zkf825nviAAAABXRSTlMz65/jSamIpAgAAABkSURBVDjLY3AOxQNMGEzxSQczhDLgAaGj0rSXZhJUwCetGhqET1o0NBCfNDCOR6VJkFZEyR5CaNJMaNlHAVWaEU1agIA0AcPxO20whdpQlwZmInKyICIDD9ayZeRI46/mCFSSAPzEgRk4Bsk7AAAAAElFTkSuQmCC",C="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8BAMAAADI0sRBAAAAElBMVEUykf8ykP80kv8zkv80k/8zkf8mH/+kAAAABXRSTlMz6+OfSXfpA8YAAABHSURBVDjLY3AKxQNUGFTxSQcxhDLgAaGj0qPSI0raECV7CKNJM6NlHwNUaUY0aQEC0gQMx++0wRRqo9Kj0gMrTaCaI1BJAgAZlmm5TBaU5QAAAABJRU5ErkJggg==";export{g as _,S as a,N as b,C as c,M as d,B as e};
+import{d as e,p as A,a,r,o as l,b as t,F as s,f as o,g as k,e as f,t as n,w as i,j as c,h as y,c as u,y as d}from"./index.34ebf41f.js";var g=e({name:"Brief",props:{list:{type:Array,required:!0},color:{type:String,default:null},size:{type:String,default:"0.22rem"},align:{type:String,default:"horizontal"}}});const p=i("data-v-42bff056");A("data-v-42bff056");const v={key:1},z={class:"count-group"},w=c(" / ");a();const m=p(((e,A,a,i,c,y)=>{const u=r("m-count");return l(),t("div",{class:["brief-container",{vertical:"vertical"===e.align}]},[(l(!0),t(s,null,o(e.list,(A=>(l(),t("div",{key:A.name},[A.icon?(l(),t("img",{key:0,src:A.icon,style:`width:${e.size};height:${e.size}`},null,12,["src"])):k("",!0),Array.isArray(A.value)?(l(),t("div",v,[f("div",z,[f(u,{class:"count orange-count",value:A.value[0],style:{color:e.color}},null,8,["value","style"]),w,f(u,{class:"count",value:A.value[1]},null,8,["value"])]),f("p",null,n(A.name),1)])):(l(),t("div",{key:2,class:{center:!A.icon}},[f(u,{class:"count",style:{color:e.color},value:A.value},null,8,["style","value"]),f("p",null,n(A.name),1)],2))])))),128))],2)}));g.render=m,g.__scopeId="data-v-42bff056";var S=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=y(null),a=u((()=>Array.isArray(e.color)?{"0%":e.color[0],"100%":e.color[1]}:e.color)),r=u((()=>A.value?A.value.clientWidth/(e.rate||1.8):0));return{circleWrapperRef:A,strokeColor:a,width:r}}});const U=i("data-v-4d97637b");A("data-v-4d97637b");const E={ref:"circleWrapperRef",class:"circle-wrapper"};a();const h=U(((e,A,a,s,o,k)=>{const i=r("a-progress");return l(),t("div",E,[f(i,{"class-name":"circle-progress",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,"trail-color":"rgba(255,255,255,0.1)"},null,8,["width","stroke-color","percent","type","show-info","stroke-width","gap-degree"]),d(e.$slots,"default",{},(()=>[f("p",null,n(e.name),1)]))],512)}));S.render=h,S.__scopeId="data-v-4d97637b";var B="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAP1BMVEUykf8ykf8ykf80kv8yk/8zkf8zkf8xkP8xkf8zkf8zkv8ykv8ykf8zkv8ykf80k/8zkv8zk/8zkf8zkf8zkf/igqmIAAAAFHRSTlMzmWbjSvOlc1/t2cG3jVY7zItaQXkfsHMAAAC2SURBVEjH7dfJCsMgFIVhbZwyT+f9n7VdFRe5HkywpMF//6EoiirT4GSNUbLlWgHqZEDFFZ/AzuIw6zj2EPMUrzJeKTZWstZQrMyoDxtN2dWew0sszGk8tUjUTkk8INlQCvNpl1swnoy9JnkZO9CciC3HVsQArxzWSkw/HYfxe4WEXOwR5TNxH+M+E7sYu0y899HA+/9s1e/xosUWfLrhee647US8ddRud30NVfxIfOVTduk7+AYjTFmjwJvA3AAAAABJRU5ErkJggg==",M="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,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8BAMAAADI0sRBAAAAElBMVEUykf8ykP8zkv80kv80k/8zkf825nviAAAABXRSTlMz65/jSamIpAgAAABkSURBVDjLY3AOxQNMGEzxSQczhDLgAaGj0rSXZhJUwCetGhqET1o0NBCfNDCOR6VJkFZEyR5CaNJMaNlHAVWaEU1agIA0AcPxO20whdpQlwZmInKyICIDD9ayZeRI46/mCFSSAPzEgRk4Bsk7AAAAAElFTkSuQmCC",C="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8BAMAAADI0sRBAAAAElBMVEUykf8ykP80kv8zkv80k/8zkf8mH/+kAAAABXRSTlMz6+OfSXfpA8YAAABHSURBVDjLY3AKxQNUGFTxSQcxhDLgAaGj0qPSI0raECV7CKNJM6NlHwNUaUY0aQEC0gQMx++0wRRqo9Kj0gMrTaCaI1BJAgAZlmm5TBaU5QAAAABJRU5ErkJggg==";export{g as _,S as a,N as b,C as c,M as d,B 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.63c19453.js"></script>
+<script type="module" crossorigin src="./assets/index.34ebf41f.js"></script>
   <link rel="modulepreload" href="./assets/vendor.f603cf3b.js">
-  <link rel="stylesheet" href="./assets/index.0c9d2306.css">
+  <link rel="stylesheet" href="./assets/index.fc83137f.css">
 </head>
 
 <body>

src/components/MyComponent/MySub/my-sub.vue

@@ -4,7 +4,11 @@
       <span />
       <p><slot /></p>
       <div v-if="addition" class="addition">
-        <MyCount v-if="addition.value" class="count" :value="addition.value" />
+        <MyCount
+          v-if="addition.value || addition.value === 0"
+          class="count"
+          :value="addition.value"
+        />
         <span v-if="addition.unit">{{ addition.unit }}</span>
       </div>
       <input

src/components/MyComponent/MySub/my-sub2.vue

@@ -8,7 +8,11 @@
       <span />
       <p><slot /></p>
       <div v-if="addition" class="addition">
-        <MyCount v-if="addition.value" class="count" :value="addition.value" />
+        <MyCount
+          v-if="addition.value || addition.value === 0"
+          class="count"
+          :value="addition.value"
+        />
         <span v-if="addition.unit">{{ addition.unit }}</span>
         <img src="@/assets/images/title-dec.png" />
       </div>

src/view/left/command.vue

@@ -155,23 +155,6 @@ export default defineComponent({
       { immediate: true }
     )
 
-    const soldierList = ref([
-      {
-        id: '1',
-        name: '姓名',
-        phone: '13652103974',
-      },
-      {
-        id: '2',
-        name: '姓名',
-        phone: '13652103974',
-      },
-      {
-        id: '3',
-        name: '姓名',
-        phone: '13652103974',
-      },
-    ])
     const curTab = ref('party')
     const setCurTab = (tab: string) => (curTab.value = tab)
     const tabList = ref([
@@ -187,22 +170,22 @@ export default defineComponent({
     const partySummary = computed(() => {
       return [
         {
-          name: '全部',
+          name: '现有党员',
           value: party.value.partyNum || 0,
           unit: '人',
         },
         {
-          name: '机关党员',
+          name: '机关直属党组织',
           value: party.value.organsParty || 0,
           unit: '人',
         },
         {
-          name: '居民区',
+          name: '居民区党组织',
           value: party.value.residential || 0,
           unit: '人',
         },
         {
-          name: '企业',
+          name: '“两新”党组织',
           value: party.value.enterprise || 0,
           unit: '人',
         },
@@ -249,7 +232,6 @@ export default defineComponent({
       leaders,
       members,
       dutyTableData,
-      soldierList,
       curTab,
       setCurTab,
       tabList,
@@ -354,4 +336,8 @@ export default defineComponent({
       flex-direction row
       >div
         flex 1
+    :deep(.summary-container)
+      >div
+        &:before
+          left -20%
 </style>

src/view/right/complain.vue

@@ -128,10 +128,20 @@ export default defineComponent({
       let data = classificationRank.value
       if (!data || data.length === 0) return { dimensions: null, source: null }
       data = [
-        data.find((e) => e.managementType === '综合'),
-        data.find((e) => e.managementType === '街面'),
-        data.find((e) => e.managementType === '小区'),
+        data.find((e) => e.managementType === '综合') || {
+          num: 0,
+          managementType: '综合',
+        },
+        data.find((e) => e.managementType === '街面') || {
+          num: 0,
+          managementType: '街面',
+        },
+        data.find((e) => e.managementType === '小区') || {
+          num: 0,
+          managementType: '小区',
+        },
       ]
+      console.log('00', data)
       const source: any = [
         {
           seriesName: '分类排行',
@@ -142,11 +152,11 @@ export default defineComponent({
       ]
       const dimensions = data.map((item, index) => {
         const name = `class${index + 1}`
-        source[0][name] = item.num
+        source[0][name] = item?.num || 0
         return {
           name,
-          displayName: item.managementType,
-          max: Math.max(...data.map((e) => +e.num)),
+          displayName: item?.managementType,
+          max: Math.max(...data.map((e) => +e?.num || 0)),
         }
       })
       return {

src/view/right/emergency-store.vue

@@ -3,6 +3,7 @@
     <div class="emergency">
       <div v-for="(item, index) in list" :key="index">
         <m-count class="count orange-count" :value="item.value" />
+        <span>处</span>
         <p>{{ item.name }}</p>
       </div>
     </div>
@@ -363,13 +364,14 @@ export default defineComponent({
   justify-content space-between
   height 80%
   >div
-    display flex
-    align-items center
-    justify-content space-around
+    text-align center
     width 20%
     .count
       font-family $font-barlow
       font-size .14rem
+    span
+      font-size .08rem
+      color #ccc
 .out-house
   flex 1
   .chart-container

src/view/right/old.vue

@@ -55,7 +55,7 @@
         </div>
       </div> -->
     </div>
-    <div>
+    <div style="min-height: 1rem">
       <m-sub2>养老方式</m-sub2>
       <div class="bar">
         <div
@@ -88,9 +88,9 @@
           <span>申请通过人数</span>
         </div>
       </div>
-      <div v-if="showChart" class="insurance-chart">
+      <!-- <div v-if="showChart" class="insurance-chart">
         <m-line :dataset="insuranceData" :option="insuranceOption" />
-      </div>
+      </div> -->
     </div>
   </m-card>
 </template>
@@ -181,11 +181,18 @@ export default defineComponent({
     const showChart = computed(() => store.state.curTheme === 'service')
     ajax.get({ url: api.GET_WISDOM_OLD }).then((res) => {
       const data = res?.data?.content || {}
+      console.log('养老占比', data)
       oldData.value = data
       oldSum.value = [
-        { name: '女性占比', value: data?.oldWomanNum || 0 },
-        { name: '男性占比', value: data?.oldManNum || 0 },
-        { name: '老龄化占比', value: data?.oldRate || 0 },
+        {
+          name: '女性占比',
+          value: ((data?.oldWomanNum || 0) / (data?.oldNum || 1)) * 100,
+        },
+        {
+          name: '男性占比',
+          value: ((data?.oldManNum || 0) / (data?.oldNum || 1)) * 100,
+        },
+        { name: '老龄化占比', value: data?.oldRate },
       ]
       pieData.value.source = [
         { name: '90-99岁', value: data?.num90_99 || 0 },
@@ -284,15 +291,16 @@ export default defineComponent({
     display flex
     align-items center
     justify-content space-around
-    width 30%
-    padding .05rem
+    width 32%
+    padding .04rem
+    box-sizing border-box
     .count
       font-size .14rem
       font-family $font-barlow
-      margin-right .03rem
+      margin-right .02rem
 .distribute
   width 100%
-  height 1rem
+  height 1.2rem
   display flex
   .chart
     width 40%
@@ -336,7 +344,7 @@ export default defineComponent({
   display flex
   width 100%
   height .06rem
-  margin .2rem 0 .14rem
+  margin .3rem 0
   >div
     position relative
     .count
@@ -355,24 +363,25 @@ export default defineComponent({
         left .05rem
     &:nth-of-type(2)
       >div
-        transform translateY(-90%)
-        border-right .01rem solid
+        transform translateY(50%)
+        border-left .01rem solid
       p
-        top -0.07rem
-        right .05rem
-        text-align right
+        bottom -0.05rem
+        left .05rem
+        text-align left
     &:nth-of-type(3)
       >div
         transform translateY(50%)
         border-right .01rem solid
       p
-        bottom -0.07rem
+        bottom -0.05rem
         right .05rem
         text-align right
 .insurance
   display flex
   justify-content space-around
   align-items center
+  margin-top .1rem
   .count
     font-size .14rem
     font-family $font-barlow

src/view/right/police.vue

@@ -89,10 +89,22 @@ export default defineComponent({
     const showChart = computed(() => store.state.curTheme === 'safety')
     const fontSize = computed(() => Math.floor((screen.height * 1.6) / 100))
     const zggfList = computed(
-      () => store.state.pubulicSafeGateSenteryZhiguangongfang
+      // () => store.state.pubulicSafeGateSenteryZhiguangongfang
+      () => [
+        { name: '有出入口', value: 283 },
+        { name: '已封闭', value: 130 },
+        { name: '有门岗处', value: 54 },
+        { name: '有值守处', value: 86 },
+      ]
     ) // 门岗值守数据 - 直管公房
     const shwyList = computed(
-      () => store.state.pubulicSafeGateSenteryShehuiwuye
+      // () => store.state.pubulicSafeGateSenteryShehuiwuye
+      () => [
+        { name: '有出入口', value: 23 },
+        { name: '已封闭', value: 40 },
+        { name: '有门岗处', value: 12 },
+        { name: '有值守处', value: 28 },
+      ]
     ) // 门岗值守数据 - 社会物业
     const safeMap = computed(() => store.state.pubulicSafeMap) // 门岗值守数据 - 社会物业
     const streetData = ref({})

src/view/right/population.vue

 <template>
   <m-card title="实有人口">
-    <m-sub2 :addition="{ value: truePeople.personnelNum }"> 人口数量 </m-sub2>
+    <!-- <m-sub2 :addition="{ value: truePeople.personnelNum }"> 人口数量 </m-sub2> -->
+    <m-sub2 :addition="{ value: 76618 }"> 人口数量 </m-sub2>
     <Brief :list="summary" color="#fff" />
     <div class="content">
       <div v-for="item in population" :key="item.name">
@@ -30,9 +31,12 @@ export default defineComponent({
 
     const summary = computed(() => {
       return [
-        { name: '本市户籍', value: truePeople.value.thisCity, icon: inImg },
-        { name: '境外流入', value: truePeople.value.outCountry, icon: out },
-        { name: '境内流入', value: truePeople.value.inCountry, icon: china },
+        { name: '本市户籍', value: 95718, icon: inImg },
+        { name: '境外流入', value: 2833, icon: out },
+        { name: '境内流入', value: 29052, icon: china },
+        // { name: '本市户籍', value: truePeople.value.thisCity, icon: inImg },
+        // { name: '境外流入', value: truePeople.value.outCountry, icon: out },
+        // { name: '境内流入', value: truePeople.value.inCountry, icon: china },
       ]
     })