瀏覽代碼

显示问题

gaoxiong 1 年之前
父節點
當前提交
75abf2452e

+ 1 - 1
src/config/env.development.js

@@ -2,7 +2,7 @@
 module.exports = {
   title: 'soc-app-dev',
   baseUrl: 'http://10.87.10.55:8080', // 本地图片地址
-  baseApi: '/dev', // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
+  baseApi: '/gaoxiong', // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

+ 16 - 8
src/views/menu/cockpit/components/overviewCom.vue

@@ -31,11 +31,12 @@
         <div class="titleText"><span class="leftSty"></span><span>GA38-2021</span></div>
         <div class="complete">
           <div class="numCls wj-title-blue">
-            {{ parseInt((allData.ga38['GA382021'].currentCompletedRate || 0) * 100) }}%
+            <!--{{ parseInt((allData.ga38['GA382021'].currentCompletedRate || 0) * 100) }}%-->
+            {{allData.ga38['GA382021'].shouldComplete || 0}}
           </div>
         </div>
         <div class="moduleItem">
-          <div>
+          <!--<div>
             <div class="numCls wj-title-blue">{{ allData.ga38['GA382021'].currentCompletedCount }}</div>
             <div class="fontCls">当月新增数</div>
           </div>
@@ -46,17 +47,22 @@
               <span>{{ Math.abs(parseInt(allData.ga38['GA382021'].compare )) }}</span>
             </div>
             <div class="fontCls ">较上月增长数</div>
-          </div>
+          </div>-->
+          <div class="fontCls">当前达标数</div>
         </div>
       </div>
 
       <div class="moduleCom">
         <div class="titleText"><span class="leftSty"></span><span>GA38-2015</span></div>
         <div class="complete">
-          <div class="numCls wj-title-blue">{{ parseInt((allData.ga38['GA382015'].currentCompletedRate||0) * 100) }}%</div>
+          <div class="numCls wj-title-blue">
+            <!--{{ parseInt((allData.ga38['GA382015'].currentCompletedRate||0) * 100) }}%-->
+
+            {{allData.ga38['GA382015'].shouldComplete || 0}}
+          </div>
         </div>
         <div class="moduleItem">
-          <div>
+    <!--      <div>
             <div class="numCls wj-title-blue">{{ allData.ga38['GA382015'].currentCompletedCount }}</div>
             <div class="fontCls">当月新增数</div>
           </div>
@@ -68,7 +74,8 @@
               <span>{{ Math.abs(parseInt(allData.ga38['GA382015'].compare ))}}</span>
             </div>
             <div class="fontCls ">较上月增长数</div>
-          </div>
+          </div>-->
+          <div class="fontCls">当前达标数</div>
         </div>
       </div>
     </div>
@@ -81,7 +88,7 @@
           <div class="numCls wj-title-blue">
             {{ parseInt(allData.taskInfo[Object.keys(allData.taskInfo)[index]].currentCompletedRate * 100) }}%
           </div>
-         
+
         </div>
         <div class="moduleItem">
           <div>
@@ -92,7 +99,8 @@
           </div>
           <div>
             <div class="numCls wj-title-blue tal">
-              <van-icon name="play" class="wj-title-green rate " />
+              <van-icon v-if="allData.taskInfo[Object.keys(allData.taskInfo)[index]].compare  > 0" name="play" class="wj-title-red rate270" />
+              <van-icon v-else name="play" class="wj-title-green rate" />
               <span
                 >{{ Math.abs(parseInt(allData.taskInfo[Object.keys(allData.taskInfo)[index]].compare * 100)) }}%</span
               >

+ 1 - 0
src/views/menu/resumption/detail.vue

@@ -75,6 +75,7 @@
                   :title="item.nfcName"
                 >
                   <span style="color: green">已完成</span>
+                  <div>{{item.submitTime === null ? '' : item.submitTime}}</div>
                 </van-cell>
               </van-list>
             </van-tab>