Procházet zdrojové kódy

中心版 项目版首页问题修复

fujunwen před 4 roky
rodič
revize
36bba4a305
2 změnil soubory, kde provedl 18 přidání a 14 odebrání
  1. 11 9
      src/views/homepage/index.vue
  2. 7 5
      src/views/statistics/index.vue

+ 11 - 9
src/views/homepage/index.vue

@@ -56,10 +56,11 @@
                                 <p class="line">
                                     <span >{{option.type === 1 ? '维保': option.type === 0 ? '专维' :  '第三方检测' }}</span>
                                     <span>
-                                        <em :style="{color:item.level == 1? '#646C73':'#C13830'}">{{option.unfinished}}</em>/<em>{{option.month_unfinished}}</em>/<em>{{option.total}}</em></span>
+                                        <em >{{option.total}}</em>/<em>{{option.unfinished}}</em>/<em :style="{color:item.level == 1? '#646C73':'#C13830'}">{{option.month_unfinished}}</em></span>
                                 </p>
                                 <p class='desc'>
-                                    {{option.type ===1 ? '即将逾期/当月未完成/总任务' :  '即将逾期/今年未完成/总任务' }}
+                                    总数/未完成/即将逾期
+                                    <!-- {{option.type ===1 ? '即将逾期/当月未完成/总任务' :  '即将逾期/今年未完成/总任务' }} -->
                                 </p>
                             </div>
                         </div>
@@ -76,15 +77,15 @@
                 </div>
                 <div class='table'>
                     <div class='row table-header'>
-                        <article>日期</article>
-                        <article>事项类型</article>
-                        <article>更新内容</article>
+                        <article>日期 </article>
+                        <article>事项类型 </article>
+                        <article>更新内容 </article>
                     </div>
                     <div class='table-body'>
                         <div class='row' v-for='(item , index) in changeList' :key='index'>
                             <article>{{item.changedate}}</article>
                             <article>{{item.type}}</article>
-                            <article>{{item.content || '--'}}</article>
+                            <article :title="item.content">{{item.content || '--'}}</article>
                         </div>
                     </div>
                 </div>
@@ -136,6 +137,7 @@ export default {
         this.getItemsQuery()
         this.getInstructionList()
     },
+
     methods: {
         imgSrc(code) {
             return require('../../assets/images/icons/' + code + '.png')
@@ -240,7 +242,7 @@ export default {
                 getParams: {
                     plazaId: this.plazaId,
                     page: 1,
-                    size: 10
+                    size: 13
                 }
             }
 
@@ -258,7 +260,7 @@ export default {
                         } else if (item.objtype === 3) {
                             item.type = '综合事项'
                         } else if (item.objtype === 4) {
-                            item.type = '重维修'
+                            item.type = '重维修'
                         } else {
                             item.type = '其他事项'
                         }
@@ -456,7 +458,7 @@ export default {
                                 em {
                                     font-weight: normal;
                                 }
-                                em:first-child {
+                                em:last-child {
                                     font-size: 1.6rem;
                                     font-weight: bold;
                                 }

+ 7 - 5
src/views/statistics/index.vue

@@ -66,7 +66,7 @@
                                 <div class='system-equipments'  style="padding-top:2rem; margin-bottom:2rem;">
                                     <div class='number' v-for='(equip , index) in item.assetTypeList' :key='index'>
                                         <div class="title">
-                                            <P :title="equip.category_name">{{equip.category_name}}</p>
+                                            <P :style="{width: equip.category_name.length>6 ? '10rem' : 'auto'}"  :title="equip.category_name">{{equip.category_name}}</p>
                                             <span :style="{right: equip.is_exception_num > 99 ? '-2rem' :  equip.is_exception_num > 9 ? '-1.5rem' :'-1rem'}" v-if='equip.is_exception_num'>{{equip.is_exception_num}}</span>
                                         </div>
                                         <p> <span>{{equip.asset_num}}</span><span>台</span></p>
@@ -82,7 +82,7 @@
                                     </div>
                                 </section>
                             </section>
-                            <div v-else style='width:65%;text-align:center;'>暂无数据</div>
+                            <div v-else style='width:65%;text-align:center;'> 暂无数据</div>
                         </li>
                     </ul>
                 </div>
@@ -100,10 +100,10 @@
                         <div class='img'>
                             <img src='../../assets/images/icons/audit.png' />
                         </div>
-                        <p>当月说明书更新项目数量</p>
+                        <p>当月说明书更新数量</p>
                         <div class="describe">
                             <span style="margin-right:20px;">更新广场数量 <strong>{{plazaInfoCount.rptChangeCount}}</strong></span>
-                            <span>更新事项数量 <strong>{{plazaInfoCount.zhsxChangeCount}}</strong></span>
+                            <span>更新事项数量<strong>{{plazaInfoCount.zhsxChangeCount}}</strong></span>
                         </div>
                     </div>
                 </section>
@@ -624,6 +624,8 @@ export default {
                     if (res.result == 'success') {
                         let result = res.data
                         if (result && Array.isArray(result)) {
+                            console.log(result)
+                            result[6].assetTypeList[0].is_exception_num = 100
                             result.forEach(item => {
                                 let list = item.assetTypeList
                                 if (list) {
@@ -708,6 +710,7 @@ export default {
                 center: new L.LatLng(38, 103),
                 zoom: 4,
                 crs: L.CRS.EPSG3857,
+                // minZoom:
                 zoomControl: false,
                 boxZoom: false,
                 attributionControl: false,
@@ -1365,7 +1368,6 @@ export default {
                                         p{
                                             display: inline-block;
                                             position: relative;
-                                            width: 12rem;
                                             color: #1f2429;
                                             font-size: 1.4rem;
                                             line-height: 2rem;